Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 191892d5e1443a94e587c6111edabab49111d24c,823ec0edc42fe49905cb31f38d1b27d4892f19ad..c30e4bb1c4230d3c1166f6b11b09999de85e3d7a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,57 -1,8 +1,62 @@@
 +2010-01-14, Version 4.9.1
 +      * Documentation: Some manpage fixes.
 +      * Default config: Added sample configuration for missing plugins.
 +      * apache plugin: Fix a segmentation fault in the config handling of
 +        VerifyPeer / VerifyHost. Thanks to "plazmus" for his or her patch.
 +      * processes plugin: Fix handling of derive data sources.
 +      * rrdtool plugin: Fix a bug with random write timeouts. Due to an
 +        incorrect initialization some files may be suspended basically
 +        indefinitely. After flushing the files they were written regularly
 +        again.
 +      * routeros plugin: Use the node name for the "host" field.
 +      * Monitorus.pm: Put the plugin into the "Collectd::Plugins" namespace.
 +      * Perl bindings: Fix a warning that was printed when building
 +        debugging output.
 +
 +2009-12-21, Version 4.9.0
 +      * contextswitch plugin: The new ContextSwitch plugin gathers the
 +        number of context switches done by the CPU. Thanks to Patrik
 +        Weiskircher for the patch.
 +      * cpu plugin: Support for SMP (multiple processors) under FreeBSD has
 +        been added. Thanks to Doug MacEachern for the patch.
 +      * curl plugin: The “MeasureResponseTime” option has been added. Thanks
 +        to Aman Gupta for the patch.
 +      * df plugin: Collecting the inode count and reserved space has been
 +        added. Thanks to Patrik Weiskircher for the patch.
 +      * exec plugin: The environment variables “COLLECTD_INTERVAL” and
 +        “COLLECTD_HOSTNAME” are now set before executing the application.
 +      * Monitorus plugin: This Perl-based plugin to query statistics from
 +        mon.itor.us has been added. Thanks to Jeff Green for the patch.
 +      * netapp plugin: New plugin to collect statistics from NetApp filers.
 +        Thanks to Sven Trenkel of the noris network AG for the patch.
 +      * network plugin: Statistics collection about the plugin itself has
 +        been implemented.
 +      * openvpn plugin: Add support for more versions of the “status file”.
 +        Thanks to Marco Chiappero for the patch.
 +      * OpenVZ plugin: This Perl-based plugin to gather OpenVZ statistics
 +        has been added. Thanks to Jonathan Kolb for the patch.
 +      * ping plugin: The config options "SourceAddress" and "Device"
 +        have been added. Thanks to Sebastian Harl for the patch.
 +      * processes plugin: Collection of IO-metrics has been added. Thanks to
 +        Andrés J. Díaz for the patch.
 +      * python plugin: The new Python plugin integrates a Python interpreter
 +        into collectd and allows to execute plugins written in the scripting
 +        language. Thanks to Sven Trenkel for his work.
 +      * routeros plugin: The new RouterOS plugin queries interface and
 +        wireless registration statistics from RouterOS.
 +      * Various plugins: AIX support has been added to the cpu, disk,
 +        interface, load, memory, processes, and swap plugins. Thanks to
 +        Manuel Sanmartin for his patches.
 +      * hashed match: This match for simple load balancing and redundant
 +        storage has been added.
 +      * scale target: This target to scale (multiply) values by an arbitrary
 +        value has been added.
 +
+ 2010-04-22, Version 4.8.5
+       * collectd: Append a newline to messages written to STDERR.
+       * network plugin: Fix a segmentation fault when receiving packets with
+         an unknown data source type.
+ 
  2010-04-07, Version 4.8.4
        * Build system, various plugins: Fixes for AIX compatibility have been
          added. Thanks to Manuel Sanmartin for his patches.

diff --cc version-gen.sh
index a84eddb4728b6a3c9e753ac7f4bcd1f20348b217,ec54a508a005b6adaf6a411b2a418be7264e22dc..4f1636692a977a2be4b7f336fb12aa7d7e9c0067
--- 1/version-gen.sh
--- 2/version-gen.sh
+++ b/version-gen.sh
@@@ -1,6 -1,6 +1,6 @@@
  #!/bin/sh
  
- DEFAULT_VERSION="4.8.4.git"
 -DEFAULT_VERSION="4.8.5.git"
++DEFAULT_VERSION="4.9.1.git"
  
  VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"