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

[Florian Forster]

 ChangeLog      |   22 ++++++++++++++++++++++
 version-gen.sh |    2 +-
 2 files changed, 23 insertions(+), 1 deletions(-)

New commits:
commit e4d28459ac49f8386626274442f3678301287d94
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Oct 4 09:06:18 2009 +0200

    Bumped version to 4.8.1; Updated ChangeLog.

commit 08597c4e80e8dd5d0a04c823b055ef230194a2b6
Merge: ec6204a39b67229bfb05b763d1ceea135150880d 44a080a9d7cecc63b7bf1842cdaf7ce357e08c46
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Oct 4 09:02:31 2009 +0200

    Merge branch 'collectd-4.7' into collectd-4.8
    
    Conflicts:
    	ChangeLog
    	version-gen.sh

commit 44a080a9d7cecc63b7bf1842cdaf7ce357e08c46
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Oct 3 17:44:24 2009 +0200

    Bumped version to 4.7.4; Updated ChangeLog.