v3.1.1skytools_3_1_1

4 files changed, 23 insertions, 6 deletions

diff --git a/AUTHORS b/AUTHORS
index d6014181..2d1bc3b0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,7 +15,9 @@ Charles Duffy
 Devrim Gündüz
 Dimitri Fontaine
 Dmitriy V'jukov
+Doug Gorley
 Egon Valdmees
+Emiel van de Laar
 Erik Jones
 Götz Lange
 Hannu Krosing
diff --git a/NEWS b/NEWS
index 55a56315..d40c5ead 100644
--- a/NEWS
+++ b/NEWS
@@ -1,30 +1,39 @@
 
-2012-09-xx  -  SkyTools 3.1.1  -  ""
+2012-10-09  -  SkyTools 3.1.1  -  "Service Oriented Diapers"
 
-  = Features =
+  Queue_mover and queue_splitter now have service names ending with 3.
+  Config files need to change: [queue_mover3], [queue_splitter3].
+
+  = Minor Features =
 
     * scriptmgr: option for specifying service type (-t / --type)
     * scriptmgr: status command can optionally be more selective
-    * skytools_upgrade: "dry run" option
-    * qadmin.py: "show version" command
+    * skytools_upgrade: "dry run" option (--not-really)
+    * pgq.Consumer: log idle time, keepalive_stats tper
+    * pgq.Consumer: keepalive_stats to force logging even when idle
 
   = Cleanups =
 
+    * qadmin.py: "show version" command
     * qadmin.py: unified results displaying
     * skytools.scripting: added shutdown() to BaseScript
     * skytools.scripting: log config reload, updated comment.
     * skytools.__init__: added symbols for natsort module
     * qadmin.py: updated script version, added pgq version, amended messages
-    * scripts: changed queue_mover and queue_splitter service_name
+    * scripts: changed queue_mover and queue_splitter service_name to end with '3'
 
   = Fixes =
 
+    * pgqd: make connections handling more robust
+    * londiste compare/repair: when provider is branch, stop it's worker to get sync
     * walmgr: Don't complain if a nonexistent WAL file is encountered during cleanup.
     * pgq_node.demote_root: decrease lock level
     * londiste.local_remove_table: resture DDL if still attached to table
     * pgq_coop.next_batch: check and create subconsumers after locking main consumer
+    * --sync-watermark: don't allow subtree wm get above upstream wm
     * londiste compare: calculate common column names
     * londiste compare: use md5() if comparing 8.3 with 8.4+
+    * Use python interpreter given by '--with-python=PYTHON' everywhere
 
 2012-07-19  -  SkyTools 3.1  -  "Carnival-on-a-Stick"
 
diff --git a/configure.ac b/configure.ac
index 6a244cc7..510d1921 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(skytools, 3.1)
+AC_INIT(skytools, 3.1.1)
 AC_CONFIG_SRCDIR(python/londiste.py)
 AC_CONFIG_HEADER(lib/usual/config.h)
 AC_PREREQ([2.59])
diff --git a/debian/changelog b/debian/changelog
index a7719045..3abeb71f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+skytools3 (3.1.1) experimental; urgency=low
+
+  * v3.1.1
+
+ -- Marko Kreen <marko.kreen@skype.net>  Tue, 09 Oct 2012 13:18:34 +0300
+
 skytools3 (3.1) experimental; urgency=low
 
   * v3.1