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

[Florian Forster]

 src/collectd.conf.in  |    4 ++
 src/collectd.conf.pod |   27 ++++++++++++++
 src/routeros.c        |   94 +++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 123 insertions(+), 2 deletions(-)

New commits:
commit fb10ba66ee1c7d79cca5fb5281b71a146dad3474
Merge: 413c4dab34e5cbb227644dd3ead6e6e0a3cdb08c 2b65d2425663197e4cf071823ca17d7add82aa16
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jan 13 12:14:02 2010 +0100

    Merge commit 'origin/ff/routeros'

commit 2b65d2425663197e4cf071823ca17d7add82aa16
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 13:10:50 2010 +0100

    src/collectd.conf.in: Add the new options of the routeros plugin.

commit 647f9fed7269077e98e5d813b22b5ca53984f16a
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 13:10:29 2010 +0100

    collectd.conf(5): Document the new config options of the routeros plugin.

commit b317e0c149e5ea17fda320b02002920fe887a67c
Merge: fd89cd48430cb6edf752f73a3952dd42b1fce7ab 649197d3ed512b81472de0e8a1f310520c234b20
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Tue Jan 5 12:48:34 2010 +0100

    Merge branch 'master' into ff/routeros

commit fd89cd48430cb6edf752f73a3952dd42b1fce7ab
Merge: 64df08d761d74f493633129ff7e48044903c94bb e2a838e0a38126a1c870e1608dcad73d1c2976eb
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Dec 24 11:58:45 2009 +0100

    Merge branch 'collectd-4.9' into ff/routeros
    
    Conflicts:
    
    	src/routeros.c

commit 64df08d761d74f493633129ff7e48044903c94bb
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Dec 23 18:25:32 2009 +0100

    routeros plugin: Add support for the "system resource" high-level interface.
    
    It returns such interesting information as CPU "load", memory and disk space
    used and number of bad blocks.