Merge branch 'release/skytools_3_1_5' into develop

7 files changed, 59 insertions, 7 deletions

diff --git a/INSTALL b/INSTALL
index f5772337..0ba65c22 100644
--- a/INSTALL
+++ b/INSTALL
@@ -52,7 +52,7 @@ suitable for installation.  The following additional packages are needed
 to build the debian package:
 
   devscripts autotools-dev python-all-dev python-support xmlto asciidoc
-  libpq-dev postgresql-server-dev-all
+  libevent-dev libpq-dev postgresql-server-dev-all
 
 Then build:
 
diff --git a/NEWS b/NEWS
index 603a396c..943b59db 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,48 @@
 
+2013-07-31  -  SkyTools 3.1.5  -  "Caution, Blind Man Driving"
+
+  = Features =
+
+    * walmgr: new command createslave and new option --synch-standby
+    * londiste: Dispatch handler extended to support sharding
+    * skytools.skylog: added UdpTNetStringsHandler
+
+  = Minor features =
+
+    * londiste add: --skip-non-existing option
+    * londiste add-table: --skip-non-existing ignores tables not on provider
+    * londiste add-table: --find-copy-node working with --create now
+    * londiste resync: supports --find-copy-node and --copy-node options now
+    * londiste resync: now checks if table is available on provider
+    * londiste --wait-sync: show progress in absolute numbers
+    * londiste.handlers.dispatch: added switch to ignore events aiming at obsolete (dropped) partitions
+    * querybuilder: show list of missing arguments on KeyError
+    * scripts/simple_local_consumer.py: added consumer_filter option
+    * skytools.sockutil.set_tcp_keepalive: accept socket object directly
+
+  = Fixes =
+
+    * londiste copy: fix data filtering when parallel_copies > 1
+    * londiste.playback: support multiple -v options for workers
+    * londiste.repair: made less verbose
+    * pgq.Consumer: non-lazy loading should use RetriableEvent
+    * pgq.logutriga: do not quote '-'
+    * grantfu: 2-pass processing
+
+  = Cleanups =
+
+    * londiste: inform about no tables passed on cmd line (thus nothing to do)
+    * doc: mention config option in create-* commands
+    * parse_pgarray: allow None
+    * londiste status: make node name easier to select
+    * scripts/data_maintainer.py: added suffix "3" to service name
+    * skytools.timeutil: make tests more robust
+    * londiste: changed handler argument 'key' to 'hash_key'
+    * londiste: moved hash_key logic from dispatch to part handler
+    * londiste.handlers: renamed handler 'part' to 'shard'
+    * pgq: Consumer class also need _make_event, for _load_batch_events_old()
+    * pgq: move RetriableEvent to consumer.py
+
 2013-04-17  -  SkyTools 3.1.4  -  "Boldly Going Nowhere"
 
   = Features =
@@ -106,7 +150,7 @@
     * Fix Londiste compare and repair to accept copy-condition from handler (Asko Oja)
     * londiste: don't filter EXECUTE or TRUNCATE events on merge node
     * qadmin: make "install pgq" also install pgq_coop
-    * Fix 2.1 to 3.0 upgade script, rename to pgq.upgrade_2.1_to_3.0.sql
+    * Fix 2.1 to 3.0 upgrade script, rename to pgq.upgrade_2.1_to_3.0.sql
     * Reorg of Londiste tests (Asko Oja)
     * Socket library autoconf (Tony Arkles)
     * pgq: quote internal table names
@@ -320,4 +364,3 @@
     * Londiste: handlers
     * QAdmin
     * pgqd
-
diff --git a/configure.ac b/configure.ac
index f3829de0..b40b58d5 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.4)
+AC_INIT(skytools, 3.1.5)
 AC_CONFIG_SRCDIR(python/londiste.py)
 AC_CONFIG_HEADER(lib/usual/config.h)
 AC_PREREQ([2.59])
@@ -157,4 +157,3 @@ AC_USUAL_CASSERT
 dnl Write result
 AC_CONFIG_FILES([config.mak])
 AC_OUTPUT
-
diff --git a/debian/changelog b/debian/changelog
index 3025f329..b073d363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+skytools3 (3.1.5) experimental; urgency=low
+
+  * v3.1.5
+
+ -- martinko <gamato@users.sf.net>  Wed, 31 Jul 2013 14:15:16 +0200
+
 skytools3 (3.1.4) experimental; urgency=low
 
   * v3.1.4
diff --git a/doc/londiste3.txt b/doc/londiste3.txt
index c0954a58..19b1f7c4 100644
--- a/doc/londiste3.txt
+++ b/doc/londiste3.txt
@@ -319,6 +319,9 @@ Do full copy of the table, again.
   --max-parallel-copy='max_parallel_copy'::
     Max number of parallel copy processes.
 
+  --skip-non-existing::
+    Skip objects that do not exist.
+
 Trigger creation flags (default: AIUDL):
 
 - I - ON INSERT
diff --git a/python/londiste/handlers/shard.py b/python/londiste/handlers/shard.py
index aea8a39d..329c6cf4 100644
--- a/python/londiste/handlers/shard.py
+++ b/python/londiste/handlers/shard.py
@@ -105,7 +105,7 @@ class ShardHandler (TableHandler):
             raise Exception('Error loading shard info')
 
 class PartHandler (ShardHandler):
-    __doc__ = '\n'.join(["Deprecated compat name for shard handler."] + __doc__.splitlines()[1:])
+    __doc__ = "Deprecated compat name for shard handler.\n" + __doc__.split('\n',1)[1]
     handler_name = 'part'
 
 # register handler class
diff --git a/sql/pgq_node/functions/pgq_node.get_node_info.sql b/sql/pgq_node/functions/pgq_node.get_node_info.sql
index a11dbfc3..04c4d889 100644
--- a/sql/pgq_node/functions/pgq_node.get_node_info.sql
+++ b/sql/pgq_node/functions/pgq_node.get_node_info.sql
@@ -38,11 +38,12 @@ create or replace function pgq_node.get_node_info(
 --      provider_node - provider node name
 --      provider_location - provider connect string
 --      combined_queue - queue name for target set
---      combined_type - node type of target setA
+--      combined_type - node type of target set
 --      worker_name - consumer name that maintains this node
 --      worker_paused - is worker paused
 --      worker_uptodate - is worker seen the changes
 --      worker_last_tick - last committed tick_id by worker
+--      node_attrs - urlencoded dict of random attrs for worker (eg. sync_watermark)
 -- ----------------------------------------------------------------------
 declare
     sql text;