Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

	ChangeLog
	version-gen.sh

diff --cc ChangeLog
index fceab49,6f10fac..4f33a94
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,55 -1,9 +1,61 @@@
 +2008-03-05, Version 4.3.1
 +      * exec plugin: Set supplementary group IDs.
 +      * network plugin:
 +        + 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.
 +      * swap plugin: Reapply a patch for Solaris.
 +      * tcpconns plugin: Portability improvements.
 +
 +2008-02-18, Version 4.3.0
 +      * collectd: Notifications have been added to the daemon. Notifications
 +        are status messages that may be associated with a data instance.
 +      * collectd: Threshold checking has been added to the daemon. This
 +        means that you can configure threshold values for each data
 +        instance. If this threshold is exceeded a notification will be
 +        created.
 +      * collectd: The new `FQDNLookup' option tells the daemon to use the
 +        full qualified domain name as the hostname, not just the host part
 +        es returned by `gethostname(2)'.
 +      * collectd: Support for more than one `TypesDB' file has been added.
 +        This is useful when one such file is included in a package but one
 +        wants to add custom type definitions.
 +      * collectd: The `Include' config option has been expanded to handle
 +        entire directories and shell wildcards.
 +      * collectdmon: The new `collectdmon' binary detects when collectd
 +        terminates and automatically restarts it again.
 +      * csv plugin: The CSV plugin is now able to store counter values as a
 +        rate, using the `StoreRates' configuration option.
 +      * exec plugin: Handling of notifications has been added and the
 +        ability to pass arguments to the executed programs has been added.
 +      * hddtemp plugin: The new `TranslateDevicename' option lets you
 +        disable the translation from device names to major-minor-numbers.
 +      * logfile plugin: Handling of notifications has been added.
 +      * ntpd plugin: The new `ReverseLookups' can be used to disable reverse
 +        domain name lookups in this plugin.
 +      * perl plugin: Many internal changes added support for handling multiple
 +        threads making the plugin reasonably usable inside collectd. The API has
 +        been extended to support notifications and export global variables to
 +        Perl plugins; callbacks now have to be identified by name rather than a
 +        pointer to a subroutine. The plugin is no longer experimental.
 +      * uuid plugin: The new UUID plugin sets the hostname to an unique
 +        identifier for this host. This is meant for setups where each client
 +        may migrate to another physical host, possibly going through one or
 +        more name changes in the process. Thanks to Richard Jones from
 +        Red Hat's Emerging Technology group for this plugin.
 +      * libvirt: The new libvirt plugin uses the `libvirt' library to query
 +        CPU, disk and network statistics about guest systems on the same
 +        physical server. Thanks to Richard Jones from Red Hat's Emerging
 +        Technology group for this plugin.
 +
+ 2008-03-29, Version 4.2.6
+       * collectd: Improved error messages when parsing the configuration.
+       * sensors plugin: Fix temperature collection with libsensors4.
+       * unixsock plugin: Fix mixed input and output operation on streams.
+       * wireless plugin: Fix reading noise value.
+ 
  2008-03-04, Version 4.2.5
        * apache plugin: Improved initialization and error messages.
        * exec plugin: Set supplementary group IDs.