Bumped version to 4.2.5; Updated ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 6d65ee742f546528a6bfbe84d55d0e2b7b8d7eec..7e472d143737b119a41668e90e0aa53150eff50d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,18 @@
 2008-03-04, Version 4.2.5
        * apache plugin: Improved initialization and error messages.
+       * exec plugin: Set supplementary group IDs.
        * network plugin:
          + Create separate threads for reading from the socket and parsing
            and dispatching incoming packets. Versions prior to this may have
            problems in high-load situations, where the socket receive buffers
            overflows, resulting in gaps in the data.
-         + Use `memcpy' when constructing a package to avoid alignment
-           problems.
+         + Use `memcpy' when constructing/parsing a package to avoid
+           alignment problems on weird architectures, such as Sparc.
          + Translate doubles to/from the x86 byte representation to ensure
            cross-platform compatibility.
+       * ping plugin: Correct the handling of the `TTL' setting.
        * rrdtool plugin: Ensure correct handling of the `RRATimespan' option.
-       * exec plugin: Set supplementary group IDs.
        * swap plugin: Reapply a patch for Solaris.
-       * ping plugin: Correct the handling of the `TTL' setting.
        * tcpconns plugin: Portability improvements.
 
 2008-01-21, Version 4.2.4

diff --git a/version-gen.sh b/version-gen.sh
index 187cfcc49f3f988d8faf522f0491f3c46ab0a91d..4275ffd1357e6d148c8c4f7b1740ec09f85efc0f 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEFAULT_VERSION="4.2.4.git"
+DEFAULT_VERSION="4.2.5.git"
 
 VERSION="$( git describe 2> /dev/null | sed -e 's/^collectd-//' )"