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

Florian Forster octo at verplant.org
Tue Oct 30 17:21:41 CET 2007


 src/apcups.c          |    4 ++--
 src/collectd-snmp.pod |    9 ++++-----
 src/collectd.conf.in  |    8 ++++++++
 src/collectd.h        |    5 -----
 src/hddtemp.c         |    2 +-
 src/mbmon.c           |    2 +-
 src/ntpd.c            |    2 +-
 src/plugin.h          |    6 +++++-
 src/types.db          |    2 +-
 9 files changed, 23 insertions(+), 17 deletions(-)

New commits:
commit 682dfca77df320c3b6d014074ab230009abf9098
Merge: 85f213fdfa7c5a1c2e2eb0383bfacf29f2fffba9 939a113b288dfdee7df2263c682d27d7146c6013
Author: Florian Forster <octo at noris.net>
Date:   Tue Oct 30 16:19:41 2007 +0000

    Merge branch 'collectd-4.2'

commit 939a113b288dfdee7df2263c682d27d7146c6013
Merge: 1a32f9c02e9933c6c356710ee52f6ae7ff29bc35 a7863f835399d4095dd930799b268931b5613ac3
Author: Florian Forster <octo at noris.net>
Date:   Tue Oct 30 16:19:04 2007 +0000

    Merge branch 'collectd-4.1' into collectd-4.2
    
    Conflicts:
    
    	src/collectd-snmp.pod

commit a7863f835399d4095dd930799b268931b5613ac3
Author: Florian Forster <octo at noris.net>
Date:   Tue Oct 30 16:17:43 2007 +0000

    types.db: Fix a typo: s/humitidy/humidity/

commit b400d28e853eea66d6f233a3524009dea01d9e41
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 12 22:59:15 2007 +0200

    rrdtool plugin: Wait for the ``queue thread'' to exit _after_ signaling it to exit..

commit 2ebeae41dbc831452d536d1bd27471dee33f6cf2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Oct 29 17:42:13 2007 +0100

    collectd-snmp(5): Fix typos.

commit 1a32f9c02e9933c6c356710ee52f6ae7ff29bc35
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Oct 28 15:40:28 2007 +0100

    collectd.conf: Added nginx module.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 98e9139adc077eeaaa4d2afbcb93539b15e3b62b
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Oct 28 09:58:18 2007 +0100

    collectd.h: Removed legacy definition of operation modes.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit b0c3db2d98b74ec6fef30973500cdcab30a890f6
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Oct 28 09:57:17 2007 +0100

    plugin.h: Make DEBUG() a noop when compiling without debugging support.
    
    This saves a couple of useless calls to plugin_log() which the compiler
    does not detect and remove itself.
    
    A couple of DEBUG()'s in the apcups, hddtemp, mbmon and ntpd plugins have
    been upgraded to INFO()'s. All of them provide error messages of failed
    system / libc calls which should be available to the user somehow.
    Besides, they use a local string buffer which generates an "unused
    variable" warning if DEBUG() expands to a noop.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>




More information about the collectd-changes mailing list