Merge branch 'collectd-5.1' into collectd-5.2

Conflicts:
	ChangeLog
	version-gen.sh

diff --cc ChangeLog
index c59e112e61e466a2f823635cc536a786473a3ae3,51ac44d12ab8c2ef961e23b6eb6f7006497390cf..0b0623ab47dc0e5dcdaf91120da42df3c08e9bc3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,80 -1,32 +1,109 @@@
 +2013-01-27, Version 5.2.1
 +      * Build system: "make distcheck" has been fixed. Build fixes Solaris
 +        and systems without gcrypt. Thanks to Yves Mettier for his patches.
 +      * collectd: The complaint mechanism was fixed. It reported messages
 +        more frequently than intended.
 +      * collectd-tg: A manual page has been added.
 +      * dns plugin: Build issues on FreeBSD have been fixed. Thanks to
 +        Ed Schouten for his patch.
 +      * ethstat plugin: Fix the "Map" config option. An incorrectly used
 +        character pointer may lead to a segmentation fault.
 +      * network plugin: Build issues on FreeBSD have been fixed. Thanks to
 +        Ed Schouten for his patch.
 +      * postgresql plugin: A memory leak in the writing code has been fixed.
 +        A use-after-free issue that happened when more than one database was
 +        configured was fixed. Thanks to Sebastian Harl for fixing these
 +        problems.
 +      * redis plugin: A build failure has been fixed. Thanks to Pierre-Yves
 +        Ritschard for his patch.
 +      * varnish plugin: Fix a problem with instances without name.
 +      * write_graphite plugin: A regression which rendered the
 +        "SeparateInstances" and "AlwaysAppendDS" options unusable has been
 +        fixed. A failed assertion when using types with many data sources
 +        has been fixed. Improve reporting of connection errors to not spam
 +        log files too much. Thanks to Pierre-Yves Ritschard for reporting
 +        the logging problem.
 +      * zfs_arc plugin: Fix the type used for mutex misses. Thanks to Yves
 +        Mettier for reporting this bug.
 +
 +2012-11-17, Version 5.2.0
 +      * collectd: The performance of the LISTVAL command has been improved.
 +        Thanks to Yves Mettier for the patch.
 +      * collectd: The possibility to configure the collection interval on a
 +        per-plugin basis has been added. Huge thanks to Sebastian Harl for
 +        his work.
 +      * collectd-tg: This new binary allows to generate random but real
 +        looking collectd network traffic. This can be used to load-test new
 +        plugin, for example.
 +      * libcollectdclient: Code for constructing and sending network packets
 +        in the binary format has been added.
 +      * aggregation plugin: This new plugin allows to aggregate multiple
 +        value lists into one.
 +      * amqp and write_http plugins: Meta data is now included in the JSON
 +        output format. Thanks to Mark Wong for the patch.
 +      * amqp plugin: Support for "Graphite" output has been added. Thanks to
 +        Thomas Meson for the patch.
 +      * contextswitch plugin: Support for AIX has been added. Thanks to
 +        Manuel Rozada for his patch.
 +      * disk plugin: The "UseBSDName" config option has been added to the
 +        Mac OS X version.
 +      * GenericJMX plugin: Automatically determine the host name if it isn't
 +        configured.
 +      * libvirt plugin: The "number" interface format has been added. Thanks
 +        to "Davide Guerri" for the patch.
 +      * memcached plugin: Support for multiple connections has been added.
 +        Thanks to Nicolas Szalay for the patch.
 +      * ntpd plugin: The "IncludeUnitID" config option has been added. The
 +        behavior when a peer is unreachable has been improved. Thanks to
 +        Johan Kiviniemi for the patches.
 +      * oracle plugin: The "Host" config option has been added.
 +      * pf plugin: This new plugin allows to collect statistics from BSD's
 +        packet filter "pf". Thanks to Pierre-Yves Ritschard and Stefan Rinkes
 +        for their work.
 +      * postgresql plugin: The "Instance" config option has been added.
 +        Support for writing values to a PostgreSQL database has been added.
 +        Thanks to Sebastian Harl for the patches.
 +      * processes plugin: Support for Solaris has been added. Thanks to
 +        Cosmin Ioiart for the patch.
 +      * redis plugin: Support for authenticating via password has been added.
 +        Thanks to biancalana for the patch.
 +      * rrdcached plugin: The "HeartBeat", "RRARows", "RRATimespan",
 +        "StepSize" and "XFF" config options have been added.
 +      * swap plugin: The "ReportBytes" config option has been added. The AIX
 +        version now also exports "reserved" pages and swap-in / swap-out
 +        "traffic". Thanks to Manuel Rozada for the patch.
 +      * tcpconns plugin: Use a netlink socket rather than reading from /proc
 +        for improved performance. Thanks to Michael Stapelberg for the patch.
 +
+ 2013-04-08, Version 5.1.3
+       * Build system: A bad interaction between the Java detection code and
+         libltdl has been fixed. Thanks to Dave Cottlehuber for his patch.
+       * collectd: Fixed read callback scheduling at startup.
+       * apache, ascent, bind, curl, curl_json, curl_xml, nginx and
+         write_http plugins: Portability fixes, protection from infinite
+         redirect loops, improved error handling and incorrect dereferences
+         have been fixed. Most of these are related to the cURL library.
+         Thanks to Dan Fandrich for his patches.
+       * logfile plugin: Flush the output file handle. This works around
+         caching when logging to STDOUT and redirecting into a file. Thanks
+         to Nathan Huff for the patch.
+       * mysql plugin: Fix a memory leak in the error handling. Thanks to
+         Tomas Doran for his patch.
+       * netapp plugin: Fix the interval with which values are dispatched.
+       * network plugin: Build issues under FreeBSD and initialization have
+         been fixed. Thanks to Ed Schouten for his patch.
+       * nfs plugin: A compilation problem has been fixed.
+       * notify_email plugin: Add a character set to the mail header. Thanks
+         to Manuel Cissé for his patch.
+       * rrdcached plugin: Connect to the daemon from the read callback.
+       * snmp plugin: Matching of SNMP subtrees has been improved. Thanks to
+         "jkrabbe" for the patch.
+       * thermal plugin: The initialization of dispatched value lists has
+         been fixed. Thanks to Markus Knetschke for his patch.
+       * unixsock plugin: Parsing of options with an underscore, e.g.
+         "plugin_instance" has been fixed. Thanks to Tommie Gannert for his
+         patch.
+ 
  2013-01-25, Version 5.1.2
        * Build system: "make distcheck" has been fixed. Thanks to Yves
          Mettier for his patches.