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

[Florian Forster]

 src/logfile.c |    1 +
 src/network.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f71467d9c2097ddd9eb772a4fdb985663168ec71
Merge: fe9c4eef067aa252dbbd42a364baafc373421893 2a7cae256f87f851aeaa0936a3e177bc11ee58f9
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 11:01:03 2008 +0100

    Merge branch 'collectd-4.1' into collectd-4.2

commit 2a7cae256f87f851aeaa0936a3e177bc11ee58f9
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Jan 20 23:11:53 2008 +0100

    network plugin: Made network_receive() static.
    
    This function is not exported to any other module.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>

commit 373cfa5e17da1bcb8c9f909c10c8e99f740ebb95
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Jan 20 22:54:55 2008 +0100

    logfile plugin: Added Florian to the list of copyright holders.
    
    Most of the current version has been written by him.
    
    Signed-off-by: Sebastian Harl <sh at tokkee.org>
    Signed-off-by: Florian Forster <octo at huhu.verplant.org>