[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'

[Florian Forster]

 README          |    6 ++++--
 configure.in    |   12 +++---------
 src/curl_json.c |    2 +-
 src/dns.c       |   12 ++++++++----
 src/java.c      |    4 +++-
 5 files changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 0eff156c7816507fa1865b76e948574dd320fae0
Merge: 19808b4 a24baf2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 4 12:42:23 2011 +0100

    Merge branch 'collectd-4.10'

commit a24baf2ad70837ea46cacbfee6e03537cf284ad5
Merge: 86d38d8 589c5f2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 4 12:41:51 2011 +0100

    Merge branch 'collectd-4.9' into collectd-4.10

commit 589c5f25f9cb723575fa16dd22e73dc9e7af0cfd
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 4 12:39:22 2011 +0100

    dns plugin: Include <pcap-bpf.h> if available.

commit 4bc72cf837402f7fe5f7accaec5fd719b25d4475
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Dec 30 08:10:15 2010 +0100

    java plugin: Improve an error message.

commit 86d38d88547bd38bcb0e5a450508f1bcfc14c810
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Dec 16 01:26:50 2010 +0100

    README: Document the version of libmodbus used and update URL.

commit 491712ab7dd36eb58fba23942f5edf4b76b50361
Author: Florian Forster <octo at noris.net>
Date:   Wed Dec 15 15:56:14 2010 +0100

    modbus plugin: Restore compatibility to libmodbus 2.0.3.
    
    This is the current "stable" version.

commit 1f524c3d717b14d4ab6ad66d0fbf6e3aee14c4f9
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Dec 13 09:45:44 2010 +0100

    curl_json plugin: Fix handling of arrays.