Merge branch 'collectd-4.3' into collectd-4.4

Conflicts:

	ChangeLog
	version-gen.sh

diff --cc ChangeLog
index 35e8b36cc5c35f2964f08f2ceb5f0fffda298d13,7df4cdcee5ae109fb05d8816beda146ecc1afc59..29e2223a6fa8cfccab22604e26cfcc041d1258bc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,67 -1,21 +1,85 @@@
 +2008-07-15, Version 4.4.2
 +      * build system: Use pkg-config to detect the upsclient library.
 +      * collectd: Try even harder to determine the endianess of the
 +        architecture collectd is being built on.
 +      * disk plugin: Fix for Linux 2.4: A wrong field was used as the name
 +        of disks.
 +      * dns plugin: Fix compilation errors with BIND versions 19991001
 +        through 19991005.
 +      * network plugin: Bugfix in the init routine: The init function
 +        cleared a buffer regardless of its contents. This could lead to lost
 +        values under Solaris.
 +      * nginx plugin: Remove usage of the thread-unsafe `strtok' function.
 +      * vserver plugin: Remove usage of the thread-unsafe `readdir'
 +        function.
 +      * wireless plugin: Work around incorrect noise and power values
 +        returned by some broken drivers.
 +
 +2008-06-03, Version 4.4.1
 +      * collectd: Fix the `DataSource' option within `Type' blocks. Thanks
 +        to kyrone for reporting this.
 +      * collectd: Fixed min/max output in notifications generated by
 +        threshold checking.
 +      * collectd-nagios: Fix the protocol used to communicate with the
 +        daemon.
 +      * perl plugin: Fail noisily, but don't shutdown the daemon, if
 +        initialization has errors. An issue with Perl 5.10 has been fixed.
 +      * teamspeak2 plugin: Fixed an out of bounce array access. Thanks to
 +        René Rebe and Siegmund Gorr for reporting this.
 +
 +2008-05-06, Version 4.4.0
 +      * collectd: Internal code cleanups.
 +      * collectd: Added support for a `Flush' command in the unixsock and
 +        exec plugins. This command can be used to force a plugin (or all) to
 +        flush its values to disk.
 +      * collectd: Thresholds can now be configured to apply to one data
 +        source only, making it possible to configure different thresholds
 +        for each data source.
 +      * apache, nginx plugins: Added the possibility to disable host and/or
 +        peer verification.
 +      * ascent plugin: The new ascent plugin reads and parses the statistics
 +        page of an Ascent server.
 +      * cpu plugin: Support for the statgrab library has been added.
 +      * disk plugin: The possibility to ignore certain disks or collect only
 +        specific disks has been added.
 +      * disk plugin: Support for the statgrab library has been added.
 +      * ipmi plugin: The new ipmi plugin uses the OpenIPMI library to read
 +        sensor values via IPMI, the intelligent platform management
 +        interface.
 +      * iptables plugin: The iptc library that is used by the iptables
 +        plugin has been added to the distribution, because it is not
 +        provided by all distributions and removed from at least one.
 +      * powerdns plugin: The new powerdns plugin reads statistics from an
 +        authoritative or a recursing PowerDNS name server.
 +      * rrdtool plugin: The size of the files generated with the default
 +        configuration has been decreased.
 +      * tail plugin: The new tail plugin can be used to gather statistics by
 +        continuously reading from log files.
 +      * teamspeak2 plugin: The new teamspeak2 plugin connects to a
 +        TeamSpeak2 server and collects statistics about the number of users
 +        and number of channels.
 +      * users plugin: Support for the statgrab library has been added.
 +      * vmem plugin: The new vmem plugin collects very detailed statistics
 +        about the virtual memory subsystem of Linux.
 +
+ 2008-08-30, Version 4.3.4
+       * Build system: Improved detection of and linking with the statgrab
+         library.
+       * collectd: Portability fixes, especially to determine endianess more
+         reliable.
+       * Various plugins: Fix format strings.
+       * disk plugin: A fix for giving disks under Linux 2.4 the right names
+         again has been applied.
+       * memcached plugin: Fix a too short timeout and a related file
+         descriptor leak.
+       * memory plugin: A typo in the libstatgrab code has been fixed.
+       * network plugin: A fix in the initialization function solves problems
+         under Solaris.
+       * nginx plugin: A thread-unsafe function has been replaced.
+       * vserver plugin: A thread-unsafe function has been replaced.
+       * wireless plugin: A work-around for broken wireless drivers has been
+         added.
+ 
  2008-04-22, Version 4.3.3
        * build system: Improved detection of several libraries, especially if
          they are in non-standard paths.