From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 8 Nov 2007 20:55:13 +0000 (+0100)
Subject: Bumped version to 4.2.1; Updated ChangeLog.
X-Git-Tag: collectd-4.2.1^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3734b4e6e24b558d275b4760e537b35f7506b634;p=collectd.git

Bumped version to 4.2.1; Updated ChangeLog.
---

diff --git a/ChangeLog b/ChangeLog
index 526d463d..5fe505aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-08, Version 4.2.1
+	* tcpconns plugin: Don't complain about a missing file if IPv6 is not
+	  enabled on the host.
+	* snmp plugin: Fix a memory leak.
+
 2007-10-27, Version 4.2.0
 	* collectd: The new config option `Include' lets you include other
 	  configfiles and thus split up your config into smaller parts. This
diff --git a/version-gen.sh b/version-gen.sh
index ccd3a2ef..76913876 100755
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEFAULT_VERSION="4.2.0.git"
+DEFAULT_VERSION="4.2.1.git"
 
 VERSION="$( git describe 2> /dev/null | sed -e 's/^collectd-//' )"