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

[Florian Forster]

 contrib/exec-nagios.conf |    2 +
 contrib/exec-nagios.px   |  142 +++++++++++++++++++++++++++++++++++++++++----
 src/amqp.c               |    8 ++-
 src/bind.c               |    5 +-
 src/df.c                 |    6 +-
 5 files changed, 144 insertions(+), 19 deletions(-)

New commits:
commit 3b473acc5d4d27e5cf5101a4b8cc8a21c2bb7262
Merge: 09a1be1 59c7ee1
Author: Florian Forster <octo at collectd.org>
Date:   Sat Feb 25 18:16:59 2012 +0100

    Merge branch 'collectd-5.0'
    
    Conflicts:
    	src/amqp.c
    
    Change-Id: I85ab3ee2b51830ad0b5d474cf1f18b5c828d6588

commit 59c7ee1cafaf53814838794908dd84f8101334c7
Merge: bc5ed65 1bb1667
Author: Florian Forster <octo at collectd.org>
Date:   Sat Feb 25 18:15:36 2012 +0100

    Merge branch 'collectd-4.10' into collectd-5.0
    
    Conflicts:
    	src/df.c
    
    Change-Id: Ie7c9fd4a20cc356bb53b135bf2ca2d5162a8a953

commit 1bb1667d220d07f25c584a41be7f3dfcbc1ad04b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Apr 19 13:04:35 2010 +0200

    contrib/exec-nagios.px: Implement the "NRPEConfig" option.

commit d2215ad1ade0993380566de703037bd533ac8f7a
Author: Florian Forster <octo at collectd.org>
Date:   Sat Feb 25 16:56:35 2012 +0100

    bind plugin: Fix use of the "QType" types.
    
    This should resolve GitHub issue #21.
    
    Change-Id: I67e4b440a6fbc8a8608fa672fb3320b05f9c0a12

commit ead8b249e18e5e5eff16b6260d880f4421404c4e
Author: Florian Forster <octo at collectd.org>
Date:   Sat Feb 25 11:42:19 2012 +0100

    df plugin: Fix a compiler issue with Mac OS X 10.7.
    
    Xcode Version 4.1 (11C74), GitHub issue #24
    
    Change-Id: Ic6f49a95868c7f77bfb19f9c8afc87a97a1bf670

commit bc5ed652b1fe5cf210feec21226ede3e21882b45
Author: Florian Forster <octo at collectd.org>
Date:   Sun Feb 19 12:51:09 2012 +0100

    AMQP plugin: Support sub-second sleep intervals.
    
    Change-Id: I9afcd8d17f1251b0765dfbdae5ed8581b73b15fe

commit 8573f6aa5dfcea9e104f23b3316f55e33976ccee
Author: Florian Forster <octo at collectd.org>
Date:   Sun Feb 19 12:42:57 2012 +0100

    AMQP plugin: Fix sleeping of "interval_g seconds".
    
    Since "interval_g" was changed to "cdtime_t", the plugin would sleep 2^30 times
    as long as intended. D'oh! Thanks to Xavier for reporting this!
    
    Change-Id: I8e9992307a1fdbb2df799a5359eb6695409684df