Merge branch 'collectd-4.7' into collectd-4.8

Network plugin license change with Aman Gupta's permission.

Conflicts:
	ChangeLog
	version-gen.sh

diff --cc ChangeLog
index d67203b,f04bb3b..cc0e651
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,63 -1,20 +1,80 @@@
 +2009-10-04, Version 4.8.1
 +      * Build system: Issues when building the iptables plugin have been
 +        fixed.
 +      * exec plugin: Clear the signal block mask before calling exec(2).
 +      * perl plugin: Declare the “environ” variable. This solves build
 +        issues on some platforms.
 +      * processes plugin: Remove unnecessary call of realloc(3). Thanks to
 +        Andrés J. Díaz for the patch.
 +      * unixsock plugin: Fix a (well hidden) race condition related to file
 +        descriptor handling.
 +
 +2009-09-13, Version 4.8.0
 +      * collectd: Two new data source types, “DERIVE” and “ABSOLUTE”, have
 +        been added. “DERIVE” can be used for counters that are reset
 +        occasionally. Thanks to Mariusz Gronczewski for implementing this.
 +      * thresholds: The advanced threshold options “Percentage”, “Hits”, and
 +        “Hysteresis” have been added. Thanks to Andrés J. Díaz for his
 +        patches.
 +      * curl_json plugin: The new cURL-JSON plugin reads JSON files using
 +        the cURL library and parses the contents according to user
 +        specification. Among other things, this allows to read statistics
 +        from a CouchDB instance. Thanks to Doug MacEachern for the patch.
 +      * df plugin: Using the new “ReportByDevice” option the device rather
 +        than the mount point can be used to identify partitions. Thanks to
 +        Paul Sadauskas for the patch.
 +      * dns plugin: The possibility to ignore numeric QTypes has been added.
 +        Thanks to Mirko Buffoni for the patch.
 +      * GenericJMX plugin: The new, Java-based GenericJMX plugin allows to
 +        query arbitrary data from a Java process using the “Java Management
 +        Extensions” (JMX).
 +      * madwifi plugin: The new MadWifi plugin collects information about
 +        Atheros wireless LAN chipsets from the MadWifi driver. Thanks to
 +        Ondrej Zajicek for his patches.
 +      * network plugin: The receive- and send-buffer-sizes have been made
 +        configurable, allowing for bigger and smaller packets. Thanks to
 +        Aman Gupta for the patch.
 +      * olsrd plugin: The new OLSRd plugin queries routing information from
 +        the “Optimized Link State Routing” daemon.
 +      * rrdtool plugin: A new configuration option allows to define a random
 +        write delay when writing RRD files. This spreads the load created by
 +        writing RRD files more evenly. Thanks to Mariusz Gronczewski for the
 +        patch.
 +      * swap plugin: The possibility to collect swapped in/out pages has
 +        been added to the Swap plugin. Thanks to Stefan Völkel for the
 +        patch.
 +      * tokyotyrant plugin: The new TokyoTyrant plugin reads the number of
 +        records and file size from a running Tokyo Tyrant server. Thanks to
 +        Paul Sadauskas for the patch.
 +      * unixsock plugin: Add the “GETTHRESHOLD” command. This command can be
 +        used to query the thresholds configured for a particular identifier.
 +      * write_http plugin: The new Write HTTP plugin sends the values
 +        collected by collectd to a web-server using HTTP POST requests.
 +        Thanks to Paul Sadauskas for the patch.
 +      * zfs_arc plugin: The new ZFS ARC plugin collects information about
 +        the “Adaptive Replacement Cache” (ARC) of the “Zeta File-System”
 +        (ZFS). Thanks to Anthony Dewhurst for the patch.
 +      * empty_counter match: The new Empty Counter match matches value
 +        lists, where at least one data source is of type COUNTER and the
 +        counter value of all counter data sources is zero.
 +
+ 2009-12-18, Version 4.7.5
+       * Build system, java plugin: Don't use “find -L” to search for Java
+         headers, because it's a GNU extension.
+       * Build system: Support for parallel builds has been improved. Thanks
+         Sebastian Harl and Stefan Völkel for looking into this.
+       * collectd: Print error messages to STDERR if no log plugin has been
+         loaded.
+       * memory plugin: Handling of >4 Gbyte of memory has been fixed.
+       * network plugin: The license has been changed to LGPL 2.1.
+       * oracle plugin: Reconnect to the database if the connection dies.
+       * rrdcached plugin: Work-around for a bug in RRDtool 1.4rc2 has been
+         added.
+       * snmp plugin: Handling of negative values has been fixed. Strings
+         containing control characters are now interpreted as hex-strings.
+       * unixsock plugin: A memory leak in the LISTVAL command has been
+         fixed. Thanks to Ben Knight for his patch.
+ 
  2009-10-03, Version 4.7.4
        * Build system: Issues when building the iptables plugin have been
          fixed.

diff --cc src/network.c
index 109289e,a009551..ac69254
--- 1/src/network.c
--- 2/src/network.c
+++ b/src/network.c
@@@ -1,11 -1,11 +1,12 @@@
  /**
   * collectd - src/network.c
   * Copyright (C) 2005-2009  Florian octo Forster
 + * Copyright (C) 2009       Aman Gupta
   *
   * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License as published by the
-  * Free Software Foundation; only version 2 of the License is applicable.
+  * under the terms of the GNU Lesser General Public License as published by
+  * the Free Software Foundation; only version 2.1 of the License is
+  * applicable.
   *
   * This program is distributed in the hope that it will be useful, but
   * WITHOUT ANY WARRANTY; without even the implied warranty of

diff --cc src/plugin.c
Simple merge