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

[Florian Forster]

 ChangeLog |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7c6b8505e5557622158574c8dce8ba53c53cec72
Merge: 46477f7660c7c6b9d4fa38070b2335c759179b1e e491e457a4e2be133baf25d296ccc0aab544d609
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Aug 31 16:10:33 2007 +0200

    Merge branch 'collectd-4.0'

commit e491e457a4e2be133baf25d296ccc0aab544d609
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Aug 31 16:09:53 2007 +0200

    collectd.conf(5): Undo the changes of the previous merge.
    
    This problem doesn't exist in this version.

commit 2b6176cab4f092354177473bbc74c5cdc2eaa2ec
Merge: ead5567107bc6a39a0e96b2756bc0711d67a538b 258c92657e3e1eadf2388d697554270eb6fc3f9f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Aug 31 16:08:37 2007 +0200

    Merge branch 'collectd-3.11' into collectd-4.0
    
    Conflicts:
    
    	ChangeLog
    	configure.in

commit 258c92657e3e1eadf2388d697554270eb6fc3f9f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Aug 31 12:17:48 2007 +0200

    Bumped version to 3.11.6; Updated ChangeLog.

commit a4f351e7bb3d7279bc6ac437a2186e66387f3146
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Mon Aug 27 17:02:04 2007 +0200

    collectd.conf(5): Added a note about that trailing whitespace bug.