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

[Florian Forster]

 .../collectd/java/GenericJMXConfConnection.java    |   11 ++-
 .../org/collectd/java/GenericJMXConfMBean.java     |    6 +-
 contrib/snmp-data.conf                             |   69 ++++++++++++++
 src/Makefile.am                                    |    4 +-
 src/rrdcached.c                                    |    1 +
 src/snmp.c                                         |  100 ++++++++++++++++----
 6 files changed, 167 insertions(+), 24 deletions(-)

New commits:
commit b958bfe961cf8c6a442d18c714a9d04e947e6b74
Merge: 9fbaea758b3821d305a89782b8f260cc787e21ab 179242223f25937fc528e89ef433a80d4d614611
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Nov 10 20:18:05 2009 +0100

    Merge branch 'collectd-4.8'

commit 179242223f25937fc528e89ef433a80d4d614611
Merge: 91f44c9c9dbfa746fbe63b50c87fb8bf064d0daa 3c3bc4f67827b04e01f54acc03a78894fb5c2832
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Nov 10 20:17:36 2009 +0100

    Merge branch 'collectd-4.7' into collectd-4.8
    
    Conflicts:
    	src/snmp.c

commit 3c3bc4f67827b04e01f54acc03a78894fb5c2832
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Nov 9 12:05:40 2009 +0100

    contrib/snmp-data.conf: Add support for Mikrotik RouterBoards.

commit ce372f2e17c41333a4d0a07afce585d1a31b8754
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Nov 9 12:04:23 2009 +0100

    snmp plugin: Fix handling of strings with control characters.
    
    If a byte of a string has a value <32, the string is printed as a
    hex-string. This fixes issues with some devices returning MAC addresses
    as "strings".

commit 80c2683a96b5ca56069b9ac27febdeaee91914a5
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Nov 9 12:03:20 2009 +0100

    snmp plugin: Fix handling of negative values.

commit 32ebb9e61e6f66bf5e689e37e6a61276b6b11597
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Oct 28 19:32:36 2009 +0100

    src/Makefile: Support parallel builds when creating the manpages.
    
    A temporary file name is used when creating the manpages. So far, a static
    file name had been used for that, thus causing race conditions. Now, a unique
    suffix (PID) is used to fix that.
    
    Thanks to BC^bd for reporting that on IRC!

commit 3439c4a3e08adfef8f35d0e058fadc7e71501486
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Oct 28 17:38:51 2009 +0100

    rrdcached plugin: Work around a bug in RRDtool 1.4rc2.
    
    rrd_client.h in that pre-release checked for HAVE_CONFIG_H and would then try
    to include rrd_config.h, which, obviously, is not available in collectd.

commit 91f44c9c9dbfa746fbe63b50c87fb8bf064d0daa
Author: Florian Forster <octo at noris.net>
Date:   Wed Oct 28 13:31:06 2009 +0100

    GenericJMX plugin: Close and re-open the connection upon I/O-errors.