v2.3rc1

diff --git a/AUTHORS b/AUTHORS
index 23401c0f12acc7d997dac50ff5d1bcafc1f36acc..328449c55a92dd302435aff75361dc33b11d4872 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,6 +22,7 @@ Jonah Harris
 Lei Yonghua
 Martin Pihlak
 Peter Eisentraut
+Petr Jelinek
 Steve Singer
 Ye Wenbin
 

diff --git a/Makefile b/Makefile
index 03aa78222dc36480fd6cb1d1dee3446f9e3f23e2..bbd7e2a0cfebc75aeeae810198c0fed8f0e63e6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 # PL/Proxy version
-PLPROXY_VERSION = 2.2
+PLPROXY_VERSION = 2.3rc1
 
 # set to 1 to disallow functions containing SELECT
 NO_SELECT = 0

diff --git a/NEWS b/NEWS
index aa9ca8a3c7028ce75e9bb7d4543649c7434b0bb8..4df2dec405a64cb74b8b2c3d251a3834696c4c5e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+2011-xx-xx  -  PlProxy 2.3  -  ""
+
+  = Features =
+
+    * Global SQL/MED options: ALTER FOREIGN DATA WRAPPER plproxy OPTIONS ... ;
+      (Petr Jelinek)
+
+    * New config options: keepalive_idle, keepalive_interval, keepalive_count.
+      For TCP keepalive tuning.  Alternative to libpq keepalive options
+      when older libpq is used or when central tuning is preferrable.
+
+  = Docs =
+
+    * Use Asciidoc ListingBlock for code - results in nicer HTML.
+
 2011-02-18  -  PlProxy 2.2  -  "Cover With Milk To See Secret Message"
 
   = Features =

diff --git a/debian/changelog b/debian/changelog
index c1d64070630800147c17227e53133a8451961340..1fa7cf54025a0e89099247b4cbb61615feebb7df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plproxy2 (2.3rc1-1) unstable; urgency=low
+
+  * v2.3rc1
+
+ -- Marko Kreen <[email protected]>  Tue, 13 Sep 2011 14:57:18 +0300
+
 plproxy2 (2.2-1) unstable; urgency=low
 
   * v2.2