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

[Florian Forster]

 src/hddtemp.c  |    2 ++
 src/rrdtool.c  |    7 +------
 src/tcpconns.c |   13 +++++++++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 54ada5ddddb3692d8ec3493fbf4a5fd7aa39b5d1
Merge: 60c87361467a193e2d97ebaff09aee4390350799 c999f7e40b0e9ce8f5fd4eb2042d6f3adbd6ce1e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Feb 27 08:10:08 2008 +0100

    Merge branch 'collectd-4.3'

commit c999f7e40b0e9ce8f5fd4eb2042d6f3adbd6ce1e
Merge: d5272dbabf4c7a47f34066c05f479523d7b8beae 1ac298349bc9924e4d07dc61f6bef46b9ab0a46c
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Feb 27 08:09:18 2008 +0100

    Merge branch 'collectd-4.2' into collectd-4.3

commit 1ac298349bc9924e4d07dc61f6bef46b9ab0a46c
Author: Rob Lensen <rob at bsdfreaks.nl>
Date:   Wed Feb 27 08:04:57 2008 +0100

    tcpconns plugin: Fix for compilation under FreeBSD.

commit 6f620e0af269915384fc6fbee8db0b475101d435
Author: Stefan Völkel <bd at bc-bd.org>
Date:   Mon Feb 25 20:14:19 2008 +0100

    rrdtool plugin: Simplified heartbeat calculation
    
    Looks simpler, should do the same.
    
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 0a5bd9f384dbbd5674c391ae0420e7593fcdc80d
Author: Sebastian Harl <sh at tokkee.org>
Date:   Tue Feb 19 12:24:53 2008 +0100

    hddtemp plugin: Use SCSI_DISK8_MAJOR thru SCSI_DISK15_MAJOR only if available.
    
    Some Linux versions don't seem to provide the major numbers 8 thru 15.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>