Bumped version to 5.2.1; Updated ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 6f0ae54914be51c5a95a668b5d0a77893929aa3f..0ae8eb160c0d213a646f69585077fb0ab7e17622 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2013-01-27, Version 5.1.2
+       * Build system: "make distcheck" has been fixed. Build fixes Solaris
+         and systems without gcrypt. Thanks to Yves Mettier for his patches.
+       * collectd: The complaint mechanism was fixed. It reported messages
+         more frequently than intended.
+       * collectd-tg: A manual page has been added.
+       * dns plugin: Build issues on FreeBSD have been fixed. Thanks to
+         Ed Schouten for his patch.
+       * ethstat plugin: Fix the "Map" config option. An incorrectly used
+         character pointer may lead to a segmentation fault.
+       * network plugin: Build issues on FreeBSD have been fixed. Thanks to
+         Ed Schouten for his patch.
+       * postgresql plugin: A memory leak in the writing code has been fixed.
+         Thanks to Sebastian Harl for fixing this problem.
+       * redis plugin: A build failure has been fixed. Thanks to Pierre-Yves
+         Ritschard for his patch.
+       * varnish plugin: Fix a problem with instances without name.
+       * write_graphite: A regression which rendered the "SeparateInstances"
+         and "AlwaysAppendDS" options unusable has been fixed. A failed
+         assertion when using types with many data sources has been fixed.
+         Improve reporting of connection errors to not spam log files too
+         much. Thanks to Pierre-Yves Ritschard for reporting the logging
+         problem.
+       * zfs_arc plugin: Fix the type used for mutex misses. Thanks to Yves
+         Mettier for reporting this bug.
+
 2012-11-17, Version 5.2.0
        * collectd: The performance of the LISTVAL command has been improved.
          Thanks to Yves Mettier for the patch.

diff --git a/version-gen.sh b/version-gen.sh
index 72458572b10948f0374208498080452bb420ae79..e3445412a4916077ef00e8b22a2fdf07c87990d0 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-DEFAULT_VERSION="5.2.0.git"
+DEFAULT_VERSION="5.2.1.git"
 
 VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"