Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 9d85ff086f881cf5cd82bf8e9bf0eb8f94878e57,acac4dedda7c3aab57baf87758a1bc6085417803..d61255b77b13777b283b9f551ab1ef43f7fa36b2
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,47 -1,24 +1,68 @@@
 +2009-05-01, Version 4.7.0
 +      * apache plugin: Support to query multiple servers has been added.
 +        Thanks to Amit Gupta for the patch.
 +      * apache plugin: Handling of lighttpd's scoreboard statistics has been
 +        improved. Thanks to Amit Gupta for the patch.
 +      * conntrack plugin: The new conntrack plugin collects the connection
 +        tracking table size. Thanks to Tomasz Pala for the patch.
 +      * fscache plugin: The new fscache plugin collects statistics about
 +        Linux' file-system based caching framework. Thanks to Edward
 +        Konetzko for the patch.
 +      * gmond plugin: The new gmond plugin can receive and interpret
 +        multicast traffic from Ganglia's gmond daemon.
 +      * java plugin: The new java plugin exports the collectd API to Java,
 +        making it possible to write extensions to collectd in Java.
 +      * memcachec plugin: The new memcachec plugin queries data from a
 +        memcached daemon and parses it similar to the cURL plugin. Thanks to
 +        Doug MacEachern for the initial code.
 +      * memcached plugin: Support for connections over UNIX domain sockets
 +        has been added. Thanks to Franck Lombardi for the patch.
 +      * memory plugin: Support for OpenBSD and possibly other *BSDs has been
 +        added. Thanks to Simon Kuhnle for the patch.
 +      * mysql plugin: Support to query multiple databases has been added.
 +        Thanks to Doug MacEachern for the patch.
 +      * mysql plugin: Master/slave statistics have been added.
 +      * mysql plugin: Lock statistics have been added. Thanks to Rodolphe
 +        Quiédeville for the patch.
 +      * network plugin: The possibility to sign or encrypt network traffic
 +        has been added.
 +      * protocols plugin: The new protocols plugin provides information
 +        about network protocols, such as IP, TCP and UDP.
 +      * snmp plugin: The intervals given in the configuration of the SNMP
 +        plugin must no longer be a multiple of the global interval.
 +      * table plugin: The new Table plugin provides parsing for table-like
 +        structured files, such as many files beneath /proc.
 +      * ted plugin: The new TED plugin reads power consumption measurements
 +        from “The Energy Detective” (TED). Thanks to Eric Reed for this
 +        plugin.
 +      * onewire plugin: The new `Interval' option allows collecting
 +        information from OneWire sensors at arbitrary intervals.
 +      * ping plugin: Support for collecting the drop rate and standard
 +        deviation of round-trip times has been added.
 +      * uptime plugin: The new uptime plugin can collect the server's
 +        uptime. Thanks to Marco Chiappero for the patch.
 +
+ 2009-05-09, Version 4.5.4
+       * Build system, various plugins: Many build fixes for FreeBSD,
+         OpenBSD, NetBSD, Solaris and Mac OS X. Big thanks to Doug MacEachern
+         for many fixes and providing a build system for many platforms,
+         Ulf Zimmermann for providing a FreeBSD system and Simon Kuhnle for
+         providing an OpenBSD system.
+       * collectd: Fix a potential race condition when creating directories.
+       * battery plugin: Don't complain about a missing directory every
+         interval.
+       * dns plugin: Slight portability fixes.
+       * exec plugin: Allow executed programs to close STDERR. Thanks to
+         Thorsten von Eicken for reporting this problem.
+       * irq plugin: Fix handling of overflowing 32-bit counters. Thanks to
+         Tomasz Pala for the patch.
+       * perl plugin: Portability build-fixes. Thanks to Doug MacEachern for
+         the patch.
+       * rrdtool plugin: Fix a possible race condition: If the network plugin
+         is initialized and dispatches a value before the rrdtool plugin is
+         initialized, the daemon may crash.
+       * memory plugin: Fix a potential problem under Solaris.
+ 
  2009-03-18, Version 4.6.2
        * collectd: Some Solaris utility code has been improved.
        * filter subsystem: Allow `Chains' without default targets.