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

[Florian Forster]

 build.sh          |    3 ++-
 src/configfile.c  |   10 +++++++++-
 src/cpu.c         |    2 +-
 src/memcached.c   |    2 +-
 src/utils_cache.c |    5 +++++
 version-gen.sh    |    7 +++----
 6 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit 5137825deeb5d4a5b763185f45b3916ccc49340d
Merge: f6fda65968056137e693a916b15ce448e0961c7e 307459f5a1d79ee373cf59c7c8a0824d325c43e3
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 15 11:11:12 2009 +0200

    Merge branch 'collectd-4.7'

commit 307459f5a1d79ee373cf59c7c8a0824d325c43e3
Merge: b3bfb951c73ea3d232e0e97a42479a5e3310125d d2c40f1d7bea102065733d30bba4c9b30db23ab7
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 15 11:10:19 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7
    
    Conflicts:
    
    	src/memcached.c

commit d2c40f1d7bea102065733d30bba4c9b30db23ab7
Author: Florian Forster <octo at noris.net>
Date:   Wed Jul 15 10:09:48 2009 +0200

    src/configfile.c: Warn if an unexpected block is found.
    
    If the `snmp' plugin isn't loaded (but a configuration exists), no
    warning is printed because there are only blocks in the SNMP
    configuration..

commit de1d790c3c63d5046ec6422f95cab7b980fdce1c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Jul 12 11:03:07 2009 +0200

    build.sh, version-gen.sh: Remove bashisms.
    
    Thanks to Peter Bray for pointing them out.

commit 3ad4d23b1d5f9efc2f281a1eb551465888bd4068
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 8 11:55:33 2009 +0200

    src/utils_cache.c: `ce' *is* written to in `c_avl_remove'.
    
    Therefore we should definitely free it.

commit 984f37cb1a5813d2a089129ebf906a9963b6f7c8
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jul 8 10:51:28 2009 +0200

    src/utils_cache.c: uc_check_timeout: Don't free a `ce' from the previous iteration.
    
    This may habe been a cause of the reported assertion failure, too.

commit 526320a0389a54a3629038fe6b34da8c6d4eec0e
Author: Paul Sadauskas <psadauskas at gmail.com>
Date:   Wed Jul 8 10:49:23 2009 +0200

    src/utils_cache.c: Add a missing `continue'.
    
    tokkee on IRC & I think we found a bug with utils_cache.c. The uc_check_timeout
    function is missing a continue after the "uninteresting" service check, that
    causes a key to be null.
    
    This probably caused an assertion failure in cache_compare as reported by
    Mariusz.

commit 1940ec77070be4a13bd7905f18a1c70d0f9ada64
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jul 6 22:31:28 2009 +0200

    cpu plugin: Fix a typo.

commit 10c85e89cbd077980ae297b17a23bbc42ce5d3d5
Author: Amit Gupta <amit.gupta221 at gmail.com>
Date:   Mon Jul 6 13:07:00 2009 +0200

    memcached plugin: Pass `ai_hints' to `getaddrinfo'.