Bumped version to 4.2.1; Updated ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 526d463dedfc678d7b09e342f7ea1e7975447dd9..5fe505aa623206f01a500d180a6da25421fcf074 100644 (file)
--- 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 ccd3a2ef32da4aff497d4d5a8a70846826220e19..7691387663f397b1c58c30c95ad9f24dbbd60dd9 100755 (executable)
--- 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-//' )"