Merge branch 'collectd-4.9' into collectd-4.10

Conflicts:
	ChangeLog
	src/collectd.conf.pod
	version-gen.sh

diff --cc ChangeLog
index c50ae2a9dbf50e1137135417008a411d8a54b93b,b313302cf5254825b5786a712994eb52ffd9edbc..b447b07c09def367e8c27ede5c775ed8ea85abaa
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,80 -1,30 +1,107 @@@
 +2010-07-09, Version 4.10.1
 +      * Build system: Checking for "strtok_r" under Solaris has been fixed.
 +      * Portability: Fixes for Solaris 8 have been applied. Thanks to
 +        Alexander Wuerstlein for his patch.
 +      * collectd: The shutdown speed when terminating the read threads has
 +        been improved.
 +      * libcollectdclient: A format error in the PUTVAL command has been
 +        removed. Thanks to Johan Van den Brande for fixing this.
 +      * df plugin: An error message shown when "cu_mount_getlist" fails has
 +        been added.
 +      * processes plugin: Missing initialization code for IO members of a
 +        struct has been added. Thanks to Aurélien Reynaud for fixing this.
 +      * python plugin: Memory leaks in the write and notification callbacks
 +        have been fixed. A possible crash when the plugin was loaded but not
 +        configured has been fixed. Thanks to Sven Trenkel for his patches.
 +      * snmp plugin: Verbosity with regard to unknown ASN types has been
 +        increased. A build problem on PowerPC and ARM processors has been
 +        fixed by Aurélien Reynaud; thanks!
 +      * powerdns plugin: Compatibility changes for PowerDNS 2.9.22 and above
 +        have been applied. Thanks to Luke Heberling for his changes.
 +
 +2010-05-01, Version 4.10.0
 +      * collectd: JSON output now includes the "dstypes" and "dsnames"
 +        fields. This makes it easier for external applications to interpret
 +        the data. Thanks to Chris Buben for his work.
 +      * collectd: The new "Timeout" option can be used to specify a
 +        "timeout" for missing values. This is used in the threshold checking
 +        code to detect missing values. Thanks to Andrés J. Díaz for the
 +        patch.
 +      * apache plugin: Support for "IdleWorkers" (Apache 1.*: "IdleServers")
 +        has been added.
 +      * curl plugin: The new "ExcludeRegex" allows to easily exclude certain
 +        lines from the match.
 +      * curl_xml plugin: This new plugin allows to read XML files using cURL
 +        and extract metrics included in the files. Thanks to Amit Gupta for
 +        his work.
 +      * filecount plugin: The new "IncludeHidden" option allows to include
 +        "hidden" files and directories in the statistics. Thanks to Vaclav
 +        Malek for the patch.
 +      * logfile plugin: The new "PrintSeverity" option allows to include the
 +        severity of a message in the output. Thanks to Clément Stenac for
 +        his patch.
 +      * memcachec plugin: The new "ExcludeRegex" allows to easily exclude
 +        certain lines from the match.
 +      * modbus plugin: This new plugin allows to read registers from
 +        Modbus-TCP enabled devices.
 +      * network plugin: The new "Interface" option allows to set the
 +        interface to be used for multicast and, if supported, unicast
 +        traffic. Thanks to Max Henkel for his work.
 +      * openvpn plugin: The "CollectUserCount" and "CollectIndividualUsers"
 +        options allow more detailed control over how to report sessions of
 +        multiple users. Thanks to Fabian Schuh for his work.
 +      * pinba plugin: This new plugin receives timing information from the
 +        Pinba PHP extension, which can be used for profiling PHP code and
 +        webserver performance. Thanks to Phoenix Kayo for his work.
 +      * ping plugin: The new "MaxMissed" allows to re-resolve a hosts
 +        address when it doesn't reply to a number of ping requests. Thanks
 +        to Stefan Völkel for the patch.
 +      * postgresql plugin: The "Interval" config option has been added. The
 +        plugin has been relicensed under the 2-clause BSD license. Thanks to
 +        Sebastian Harl for his work.
 +      * processes plugin: Support for "code" and "data" virtual memory sizes
 +        has been added. Thanks to Clément Stenac for his patch.
 +      * python plugin: Support for Python 3 has been implemented. Thanks to
 +        Sven Trenkel for his work.
 +      * routeros plugin: Support for collecting CPU load, memory usage, used
 +        and free disk space, sectors written and number of bad blocks from
 +        MikroTik devices has been added.
 +      * swap plugin: Support for Linux < 2.6 has been added. Thanks to Lorin
 +        Scraba for his patch.
 +      * tail plugin: The new "ExcludeRegex" allows to easily exclude certain
 +        lines from the match. Thanks to Peter Warasin for his patch.
 +      * write_http plugin: The "StoreRates" option has been added. Thanks to
 +        Paul Sadauskas for his patch.
 +      * regex match: The "Invert" option has been added. Thanks to Julien
 +        Ammous for his patch.
 +
+ 2010-11-27, Version 4.9.4
+       * Documentation: Various documentation fixes.
+       * collectd: If including one configuration file fails, continue with
+         the rest of the configuration if possible.
+       * collectd: Fix a bug in the read function scheduling. In rare cases
+         read functions may not have been called as often as requested.
+       * collectd: Concurrency issues with errno(3) under AIX have been
+         fixed: A thread-safe version of errno has to be requested under AIX.
+         Thanks to Aurélien Reynaud for his patch.
+       * curl, memcachec, tail plugins: Fix handling of "DERIVE" data
+         sources. Matching the end of a string has been improved; thanks to
+         Sebastian Harl for the patch.
+       * curl_json plugin: Fix a problem when parsing 64bit integers. Reading
+         JSON data from non-HTTP sources has been fixed.
+       * netapp plugin: Pass the interval setting to the dispatch function.
+         Restore compatibility to NetApp Release 7.3. Thanks to Sven Trenkel
+         for the patch.
+       * network plugin: Be less verbose about unchecked signatures, in order
+         to prevent spamming the logs.
+       * notify_email plugin: Concurrency problems have been fixed.
+       * python plugin: Set "sys.argv", since many scripts don't expect that
+         it may not be set. Thanks to Sven Trenkel for the patch.
+       * rrdtool, rrdcached plugin: Fix a too strict assertion when creating
+         RRD files.
+       * value match: A minor memory leak has been fixed. Thanks to Sven
+         Trenkel for the patch.
+ 
  2010-07-09, Version 4.9.3
        * Build system: Checking for "strtok_r" under Solaris has been fixed.
        * Portability: Fixes for Solaris 8 have been applied. Thanks to

diff --cc src/collectd.conf.pod
index 4faba997a59374b8bef776abdb7524fc3adb8c68,5fc75c52e345f70cd8b26d31a21fbacea9a27e66..bfb7309575f85ad8322f7859b34a2b265ebf3625
--- 1/src/collectd.conf.pod
--- 2/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@@ -129,16 -129,10 +129,20 @@@ Configures the interval in which to que
  values lead to a higher system load produced by collectd, while higher values
  lead to more coarse statistics.
  
+ B<Warning:> You should set this once and then never touch it again. If you do,
+ I<you will have to delete all your RRD files> or know some serious RRDtool
+ magic! (Assuming you're using the I<RRDtool> or I<RRDCacheD> plugin.)
+ 
 +=item B<Timeout> I<Iterations>
 +
 +Consider a value list "missing" when no update has been read or received for
 +I<Iterations> iterations. By default, I<collectd> considers a value list
 +missing when no update has been received for twice the update interval. Since
 +this setting uses iterations, the maximum allowed time without update depends
 +on the I<Interval> information contained in each value list. This is used in
 +the I<Threshold> configuration to dispatch notifications about missing values,
 +see L<"THRESHOLD CONFIGURATION"> below.
 +
  =item B<ReadThreads> I<Num>
  
  Number of threads to start for reading plugins. The default value is B<5>, but

diff --cc src/netapp.c
Simple merge

diff --cc src/processes.c
Simple merge