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

[Florian Forster]

 ChangeLog      |   12 ++++++++++++
 src/logfile.c  |    1 +
 src/network.c  |    2 +-
 version-gen.sh |    2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit d86c4d2097fdb259915ee8f80b1ed59be6e0d994
Merge: b7d9bc30c8853f75a50482ae14a74de31871cf6e f64802fc8d4599d9a5409e5f834e1fcd2c4306d6
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 11:12:50 2008 +0100

    Merge branch 'pull/master'

commit b7d9bc30c8853f75a50482ae14a74de31871cf6e
Merge: b49f3f8aca3b42e64427259dfc6c75242d37b91c f71467d9c2097ddd9eb772a4fdb985663168ec71
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 11:12:29 2008 +0100

    Merge branch 'collectd-4.2'

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>

commit fe9c4eef067aa252dbbd42a364baafc373421893
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 10:41:29 2008 +0100

    Bumped version to 4.2.4; Updated ChangeLog.

commit cb72a2216def7a5935e28644684df73e68a83425
Merge: 1b8000f6a308481daa4a6a337600e81c45ed9754 d7eb0e344ef9f0a0aa0797462bba25090933fd58
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 10:40:33 2008 +0100

    Merge branch 'collectd-4.1' into collectd-4.2
    
    Conflicts:
    
    	ChangeLog

commit d7eb0e344ef9f0a0aa0797462bba25090933fd58
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 10:39:50 2008 +0100

    ChangeLog: Fixed the date of the 4.1.6 release.

commit 1b8000f6a308481daa4a6a337600e81c45ed9754
Merge: 225494e854ddaa1c0570ac9a5fa15380b333a919 d539c6cdfa3c8664032aa53b0285b5e12882f424
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Jan 21 10:36:57 2008 +0100

    Merge branch 'collectd-4.1' into collectd-4.2
    
    Conflicts:
    
    	ChangeLog
    	version-gen.sh

commit d539c6cdfa3c8664032aa53b0285b5e12882f424
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Jan 11 11:24:19 2008 +0100

    Bumped version to 4.1.6; Updated ChangeLog.