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

[Florian Forster]

 ChangeLog              |   11 ++++++++
 contrib/collection.cgi |   65 ++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 70 insertions(+), 6 deletions(-)

New commits:
commit 549e1f3857209db73e5e254be7aa1782c5face0c
Merge: d3648402a2a770bea639ae65c2ccd42196c7a490 e9e15292f5e08e5e7e5f795ec5df2e3680042d88
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Sep 11 11:46:07 2007 +0200

    Merge branch 'uni/collectd-4.1' into collectd-4.1

commit e9e15292f5e08e5e7e5f795ec5df2e3680042d88
Author: Florian Forster <sifnfors at faui02l.informatik.uni-erlangen.de>
Date:   Mon Sep 10 10:49:51 2007 +0200

    ChangeLog: Documented the changes since 4.1.0.

commit c8ec3924c92ad3ca15229e8e923eaece64221337
Merge: 8a35017c70b0fc1a3531a0b630071dedbbaa9372 59d8ed329bdad86d73152c00e9e582f1086cef8b
Author: Florian Forster <sifnfors at faui02l.informatik.uni-erlangen.de>
Date:   Mon Sep 10 10:43:49 2007 +0200

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

commit 59d8ed329bdad86d73152c00e9e582f1086cef8b
Author: Florian Forster <sifnfors at faui02l.informatik.uni-erlangen.de>
Date:   Mon Sep 10 10:43:19 2007 +0200

    ChangeLog: Fix a merge bug.

commit b0378fa288fd429d66d5d6854e63a371831013f0
Author: Florian Forster <sifnfors at faui02l.informatik.uni-erlangen.de>
Date:   Mon Sep 10 10:41:39 2007 +0200

    ChangeLog: Added a note about the improved `sstrerror' function.

commit 9487ec7f83bf54a3d84a85f94fdc0f6715e1e517
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Sep 5 09:30:01 2007 +0200

    contrib/collection.cgi: Fix a bug in the `meta_graph_generic_stack' function.
    
    Also add a meta-graph-handler for if_[rt]x_errors.