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

[Florian Forster]

 contrib/collection3/etc/collection.conf |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit a321fd49b6e74ffddd67e9c5b44b4d6ce3a8bbe8
Merge: 1c81811 5664fba
Author: Florian Forster <octo at collectd.org>
Date:   Wed Nov 13 20:31:29 2013 +0100

    Merge branch 'collection3-data-sources' of git://github.com/raimue/collectd

commit 5664fbad7ac174355ca4a5bee878634397d85464
Author: Rainer Müller <raimue at codingfarm.de>
Date:   Wed Feb 27 19:46:41 2013 +0100

    collection3: Fix data source names
    
    Data sources were renamed in 6c1415d, but the data source names for some
    of these entries still referenced the old data sources.