Bumped version to 4.2.2; Updated ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 5fe505aa623206f01a500d180a6da25421fcf074..c7e95e98366616e21306440fe8abc6a6c5f17b0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-15, Version 4.2.2
+       * nginx plugin: Incorrect comparison of strings lead to a segfault
+         when using the plugin. Thanks to Saulius Grigaliunas for fixing
+         this.
+       * logfile plugin: The config option `Timestamp' was handled
+         incorrectly and basically always active. Thanks to Luke Heberling
+         for fixing this.
+
 2007-11-08, Version 4.2.1
        * tcpconns plugin: Don't complain about a missing file if IPv6 is not
          enabled on the host.

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