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

[Florian Forster]

 ChangeLog |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

New commits:
commit 9ce08d6e5e67d89e29a21883bdca5b79d1f908a9
Merge: f71895576cbd4b488cd66f0c96efb6fd3e7a6faf 108068f268cad453e5d3b54e288917409db1e467
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun May 10 17:24:50 2009 +0200

    Merge branch 'collectd-4.6' into collectd-4.7
    
    Conflicts:
    	ChangeLog

commit 108068f268cad453e5d3b54e288917409db1e467
Merge: 37905c5a2370c8e6edae5011978773eeaa589d09 ccd445eab1a68d3b9e2b28a6e5bc95ed0c964d8f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun May 10 17:22:47 2009 +0200

    Merge branch 'collectd-4.5' into collectd-4.6
    
    Conflicts:
    	ChangeLog
    	version-gen.sh

commit ccd445eab1a68d3b9e2b28a6e5bc95ed0c964d8f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat May 9 13:56:43 2009 +0200

    Bumped version to 4.5.4; Updated ChangeLog.