Bump version to 5.6.1; Update ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 51559545aea7a101938f299399e228a6805941e3..ff7ce70f11f66d1f5e10e9f762833ac18ad67f5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2016-10-07, Version 5.6.1
+       * Build system: Unnecessary linking of the Write Graphite plugin with
+         libyajl has been removed. Thanks to Marc Fournier.
+         Debian#839771, #1976
+       * collectd: A bug in the "FlushInterval" option that caused a
+         segmentation fault in the Write HTTP plugin has been fixed. Thanks to
+         Florian Forster. #1954
+       * Apache plugin: A syntax error has been fixed. Thanks to Florian
+         Forster.
+       * cURL-JSON plugin: A segmentation fault that occurred when handling
+         JSON with unexpected structure has been fixed. Thanks to Florian
+         Forster. #1896
+       * PostgreSQL plugin: Handling of "NULL" values in the "query_plans" and
+         "query_plans_by_table" queries has been fixed. Thanks to Bernd
+         Zeimetz. #1905
+       * RRDCacheD plugin: Reconnection behavior has been added. Thanks to
+         Sebastian Harl. Debian#657877
+       * VServer plugin: Use of a deprecated API ("readdir_r()") has been
+         fixed. Thanks to Sebastian Harl.
+       * Write Graphite plugin: Make default values configurable at compile
+         time again. Thanks to Florian Forster. #1953
+       * Write HTTP plugin: A bug has been fixed that lead to flush callbacks
+         being registered twice. Thanks to Florian Forster. #1955
+
 2016-09-11, Version 5.6.0
        * Build system: An option to to avoid building the DF plugin against XFS
          has been added. Thanks to Ruben Kerkhof. #1878

diff --git a/version-gen.sh b/version-gen.sh
index 2ef5279f16931064e169daa8bdccaab10e8c5b07..e106d80503b12dfdf9e3fc44437651d14b9d6638 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEFAULT_VERSION="5.6.0.git"
+DEFAULT_VERSION="5.6.1.git"
 
 if [ -d .git ]; then
        VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"