Bumped version to 4.2.0; Updated ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 7164706ffe07b0307bd7a7d0ca9c06759ae12d7b..916b8e4cae887e00f8fd2b8b82e9aeae24a0976f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,29 +1,29 @@
-yyyy-mm-dd, Version 4.2.0
+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
          may be especially interesting for the snmp plugin to keep the data
          definitions separate from the host definitions.
-       * perl plugin: Many changes, including the added `EnableDebugger'
-         config option which lets you debug your Perl plugins more easily.
-       * tcpconns plugin: The new `tcpconns' plugin collects the number of
-         certain TCP connections and what state they're in. This can be used
-         to see how many connections your FTP server has to handle or how
-         many outgoing connections your mailserver has open.
-       * snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
-         correct the values returned by SNMP-agents. If a <data> block is
-         defined as `table' the instance is now optional. The sequence number
-         is used as the type-instance in this case. The new `InstancePrefix'
-         option allows to add arbitary prefixes to the type-instance.
        * ipvs plugin: The new `ipvs' plugin collects IPVS connection statistics
          (number of connections, octets and packets for each service and
-         destination).
-       * rrdtool plugin: Use the thread-safe RRD-library if available. Try to
-         be more thread-safe otherwise by locking calls to the library.
+         destination). Thanks to Sebastian Harl for this plugin.
        * memcached plugin: The new `memcached' plugin connects to a memcached
          daemon process and collects statistics of this distributed caching
          system. Thanks to Antony Dovgal for contributing this plugin.
        * nginx plugin: The new `nginx' plugin reads the status page of an
          nginx daemon and saves the handeled connections and requests.
+       * perl plugin: Many changes, including the added `EnableDebugger'
+         config option which lets you debug your Perl plugins more easily.
+       * rrdtool plugin: Use the thread-safe RRD-library if available. Try to
+         be more thread-safe otherwise by locking calls to the library.
+       * snmp plugin: Added the options `Scale' and `Shift' to Data-blocks to
+         correct the values returned by SNMP-agents. If a <data> block is
+         defined as `table' the instance is now optional. The sequence number
+         is used as the type-instance in this case. The new `InstancePrefix'
+         option allows to add arbitary prefixes to the type-instance.
+       * tcpconns plugin: The new `tcpconns' plugin collects the number of
+         certain TCP connections and what state they're in. This can be used
+         to see how many connections your FTP server has to handle or how
+         many outgoing connections your mailserver has open.
 
 2007-10-24, Version 4.1.3
        * collectd: A build issue under Solaris has been resolved by renaming

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