Bumped version to 4.6.1; Updated ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 1282095fbc1a7f6068f57d277da5769d0118b7bf..10a4cc13183acb9204b3e2fc838ba7102d392410 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-22, Version 4.6.1
+       * collectd: Many documentation fixes.
+       * Collectd::Unixsock: Error handling has been improved.
+       * regex match: Don't link with the PCRE library.
+       * bind plugin: Various bugs have been fixed. Thanks to Bruno Prémont
+         for finding and fixing most of them.
+       * ipmi plugin: Fix an off-by-one error which could cause segmentation
+         faults. Thanks to Peter Holik for his patch.
+
 2009-02-16, Version 4.6.0
        * collectd: Added the `filter chain' infrastructure, which allows the
          user to use `matches' and `targets' to control value processing.

diff --git a/version-gen.sh b/version-gen.sh
index c3100595ea1f04acb4a144229b66709787814d55..69e4f9a16636b216e8eead2a41a96a070e1d09c4 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEFAULT_VERSION="4.6.0.git"
+DEFAULT_VERSION="4.6.1.git"
 
 VERSION="$( git describe 2> /dev/null | sed -e 's/^collectd-//' )"