[collectd-changes] collectd, the system statistics collection daemon: Changes to 'ff/routeros'

[Florian Forster]

 src/collectd-python.pod |   10 ++++++
 src/routeros.c          |   83 +++++++++++++++++++++++++---------------------
 2 files changed, 55 insertions(+), 38 deletions(-)

New commits:
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 e2a838e0a38126a1c870e1608dcad73d1c2976eb
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Dec 23 18:49:28 2009 +0100

    routeros plugin: Use the node name for the "host" field.
    
    Using hostname_g doesn't make much sense when you can define multiple routers,
    so this is a bug because it doesn't allow specifying multiple routers as documented.

commit 933099579e714f65a8a0429ac9af79cac8f0842e
Author: Sven Trenkel <collectd at semidefinite.de>
Date:   Tue Dec 15 20:29:15 2009 +0100

    Annoying signal documentation.