From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 15 Dec 2007 11:25:51 +0000 (+0100)
Subject: Bumped version to 4.2.2; Updated ChangeLog.
X-Git-Tag: collectd-4.2.2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d912bb0af6b4ccebb7e2e279b3c421e0bdf2d82e;p=collectd.git

Bumped version to 4.2.2; Updated ChangeLog.
---

diff --git a/ChangeLog b/ChangeLog
index 5fe505aa..c7e95e98 100644
--- 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 76913876..cf453cc5 100755
--- 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-//' )"