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

[Florian Forster]

 src/collectd.conf.pod  |    3 +++
 src/collectdmon.c      |    6 ------
 src/iptables.c         |    8 ++++----
 src/ipvs.c             |    4 ++--
 src/utils_ignorelist.c |    7 ++++---
 5 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit 011068c93883652d9729a26e0157e94811952609
Merge: a06380ec6096a4fff34505d37f60431bf0b532ea b2a7cb85e09f67cbaf114eb64bf736f3a24d9d55
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 3 23:18:28 2008 +0200

    Merge branch 'collectd-4.5'

commit b2a7cb85e09f67cbaf114eb64bf736f3a24d9d55
Merge: ee9507500f738d21858f76128501772d212c069c e0df7ed3f1a6bc3d9164dde7f25b8ed582388a9b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 3 23:14:44 2008 +0200

    Merge branch 'collectd-4.4' into collectd-4.5
    
    Conflicts:
    
    	src/utils_ignorelist.c

commit e0df7ed3f1a6bc3d9164dde7f25b8ed582388a9b
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Oct 3 23:11:47 2008 +0200

    src/utils_ignorelist.c: Fix an off-by-one errror when adding regular expressions.
    
    Resolves: #20

commit 980abcf9a631fedc82920942e4c845315c49ba9a
Author: Sebastian Harl <sh at tokkee.org>
Date:   Thu Oct 2 15:25:10 2008 +0200

    collectdmon: Do not block SIGCHLD.
    
    There is no reason to do so as we do not need to synchronize any waitpid()
    calls. In fact, doing so was wrong because waitpid() should then return with
    an error according to POSIX. This was still working so far since waitpid()
    would not return until all children terminated and this is all we really care
    about.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit e91c152671baed64c72cfd4864e5ef8c145b862e
Author: Sebastian Harl <sh at tokkee.org>
Date:   Thu Oct 2 15:05:51 2008 +0200

    collectd.conf(5): Briefly document "OKAY"-notifications.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 2daf122169d36fb7e0e3dbd0a5742a54ce2f20c9
Author: Sebastian Harl <sh at tokkee.org>
Date:   Thu Oct 2 14:54:06 2008 +0200

    ipvs plugin: Use sizeof() instead of a constant.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit ee9507500f738d21858f76128501772d212c069c
Author: Sebastian Harl <sh at tokkee.org>
Date:   Thu Oct 2 14:53:06 2008 +0200

    iptables plugin, utils_ignorelist: Fixed an off-by-one error each.
    
    Those were introduced when unifying the string handling in commit 5f9ec13b in
    cases where the exact length of the string to be copied is passed to sstrncpy
    instead of the size of the destination buffer.
    
    In case of the iptables plugin this prevented the table or chain name to match
    correctly as the user configuration was truncated. In case of the ignorelist a
    given regex was truncated.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>