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

[Florian Forster]

 src/tcpconns.c |   16 +++++++++++++---
 src/uuid.c     |    2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit a2bf02b4f5bf4a22395b57bba6715dada3859612
Merge: 139dd00301131050db32bf0cb08333aa7440c817 a1ae4b5afaf3207a7070b85f802b41b32c0b9a20
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed May 6 10:44:00 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7

commit a1ae4b5afaf3207a7070b85f802b41b32c0b9a20
Merge: 322a56392b9ed2b99f28afbb5ca1d2f642e12786 068ae14b916aa298995433da83302032c5e57c76
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed May 6 10:43:47 2009 +0200

    Merge branch 'collectd-4.5' into collectd-4.6

commit 068ae14b916aa298995433da83302032c5e57c76
Author: Doug MacEachern <dougm at hyperic.com>
Date:   Wed May 6 10:42:01 2009 +0200

    uuid plugin: Pass `int' to `isxdigit'.
    
    Fixes compilation on NetBSD and possibly other systems.
    
    Signed-off-by: Doug MacEachern <dougm at hyperic.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 5b17ea02b681f681e30db9e0359633d987949b50
Author: Doug MacEachern <dougm at hyperic.com>
Date:   Wed May 6 10:41:08 2009 +0200

    tcpconns plugin: Compilation fixes for NetBSD.
    
    Signed-off-by: Doug MacEachern <dougm at hyperic.com>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>