v2.5rc1

diff --git a/Makefile b/Makefile
index 25ef9628474b5b8bf90fe3c5937c0830a233c496..75f2c72bdfc5d7de4a1bea29cdf0f3a6e85ead3f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 EXTENSION  = plproxy
 
 # sync with NEWS, META.json, plproxy.control, debian/changelog
-DISTVERSION = 2.5
+DISTVERSION = 2.5rc1
 EXTVERSION = 2.5.0
 UPGRADE_VERS = 2.3.0 2.4.0
 

diff --git a/NEWS b/NEWS
index 143f998ce210a97e07d218efadf5b0640a5d3df9..25eac423519010e2834d3bf6fb9e9b50aab8f03d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+2012-11-xx  -  PlProxy 2.5  -  ""
+
+  = Fixes =
+
+    * When sending cancel request to server, wait for answer
+      and discard it.  Without waiting the local backend might
+      be killed and cancel request dropped before it reaches
+      remote server - eg. when there is pgbouncer in the middle.
+
+    * When return record is based on type or table, detect changes
+      and reload the type.
+
+    * Allow type or table to have dropped fields.
+
 2012-05-07  -  PlProxy 2.4  -  "Light Eater"
 
   = Features =

diff --git a/debian/changelog b/debian/changelog
index 4219ed1a23053394987c6aed4b521d820c23e025..0a9f800f7dc164fdb221508a6830ccaf991314d2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plproxy2 (2.5~rc1-1) unstable; urgency=low
+
+  * v2.5rc1
+
+ -- Marko Kreen <marko.kreen@skype.net>  Wed, 31 Oct 2012 14:48:21 +0200
+
 plproxy2 (2.4-1) unstable; urgency=low
 
   * v2.4