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

[Florian Forster]

 ChangeLog      |   15 +++++++++++++++
 version-gen.sh |    2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 3734b4e6e24b558d275b4760e537b35f7506b634
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Nov 8 21:55:13 2007 +0100

    Bumped version to 4.2.1; Updated ChangeLog.

commit 613c72c29b5405d7e170ae7fe12611492ecb5fef
Merge: 49bb3bcd390c7b4611ca8f5e6a6f8921802e176b 6d17d79f77570f68314ab3c3f63720e361b6af58
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Nov 8 19:49:17 2007 +0100

    Merge branch 'collectd-4.1' into collectd-4.2
    
    Conflicts:
    
    	ChangeLog
    	contrib/PerlLib/Collectd.pm
    	version-gen.sh

commit 6d17d79f77570f68314ab3c3f63720e361b6af58
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Nov 8 10:49:54 2007 +0100

    Bumped version to 4.1.4; Updated ChangeLog