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

[Florian Forster]

 ChangeLog                   |   17 +++++++++++++++--
 contrib/PerlLib/Collectd.pm |    2 +-
 contrib/collection.cgi      |   38 +++++++++++++-------------------------
 src/netlink.c               |   11 +++++++----
 src/snmp.c                  |   37 +++++++++++++++++++++++++++++--------
 src/wireless.c              |   44 ++++++++++++++++++++++++++++++++------------
 version-gen.sh              |    2 +-
 7 files changed, 98 insertions(+), 53 deletions(-)

New commits:
commit 0fbdd776a6d9203939d6c85139768adf2725059c
Merge: f3aff73199d94c6eed0dffaeefb5b1b2b6c2c362 aad06a384be9b35bebfb10c048ce01129e384a7e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 28 16:40:06 2007 +0200

    Merge branch 'collectd-4.1'
    
    Conflicts:
    
    	ChangeLog

commit aad06a384be9b35bebfb10c048ce01129e384a7e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 28 15:55:44 2007 +0200

    Bumped version to 4.1.2; Updated ChangeLog.

commit 7e4b7b46592718cafa5f21ce03bd10dcf919a26d
Merge: 51ed8fc1a698fbfd1d557d7615228c32dcbc2105 ccb9071b7964b99ae616c9b324ca7413c08f8809
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 28 15:46:46 2007 +0200

    Merge branch 'collectd-4.0' into collectd-4.1
    
    Conflicts:
    
    	ChangeLog
    	configure.in
    	contrib/PerlLib/Collectd.pm

commit ccb9071b7964b99ae616c9b324ca7413c08f8809
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 28 15:43:41 2007 +0200

    Bumped version to 4.0.9; Updated ChangeLog.

commit bd66a09b35da21dcb405650ae4587bf2ca811438
Merge: bb660d244f59edb16bfbb268f9b4894f878cb771 b823f25ad764b81de842c4c0db37b6b22aeac97c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 28 13:45:39 2007 +0200

    Merge branch 'collectd-3.11' into collectd-4.0
    
    Conflicts:
    
    	ChangeLog
    	configure.in
    	src/wireless.c

commit b823f25ad764b81de842c4c0db37b6b22aeac97c
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 28 13:00:23 2007 +0200

    Bumped version to 3.11.7; Updated ChangeLog.

commit bb660d244f59edb16bfbb268f9b4894f878cb771
Merge: 92fad124c0dc9ab7a1ed6ea7af8749e4bf975092 aa2678bdd6d8bd390879683d88459b4ec40f7ea3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 28 12:41:21 2007 +0200

    Merge branch 'ff/collection' into collectd-4.0

commit 92fad124c0dc9ab7a1ed6ea7af8749e4bf975092
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 28 12:41:17 2007 +0200

    contrib/collection.cgi: Add a vertical legend to `meta_graph_memory'.

commit aa2678bdd6d8bd390879683d88459b4ec40f7ea3
Author: Florian Forster <octo at noris.net>
Date:   Fri Sep 28 10:32:28 2007 +0000

    contrib/collection.cgi: Fix the `charge' and `current' graphs.

commit 51ed8fc1a698fbfd1d557d7615228c32dcbc2105
Merge: f01e1bf6391584c4bec473ba37197b2cbd8f146f 2648e102fdcbc1c5ba71beefd6ed4db4ec1a86cc
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 28 12:19:19 2007 +0200

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

commit 2648e102fdcbc1c5ba71beefd6ed4db4ec1a86cc
Author: Florian Forster <octo at noris.net>
Date:   Thu Sep 27 16:12:44 2007 +0000

    snmp plugin: Improved the error messages in the init code.

commit b7a5d1ddb9fa3a650c2886efc3d92142f028ea0d
Author: Florian Forster <octo at noris.net>
Date:   Thu Sep 27 15:58:41 2007 +0000

    snmp plugin: Fix a segfault when a host times out but more data should be queried.

commit 97807957721f191e3963b0af3423d85da9f9b832
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Sep 27 16:13:02 2007 +0200

    snmp plugin: Handle `ASN_TIMETICKS' as `counter' if it's known by the SNMP library.

commit f01e1bf6391584c4bec473ba37197b2cbd8f146f
Merge: f54383fea028792d59b3ac845c3fbeb423ca1b4f 00ff99d8769ede67a8aefbb2836c1f832dbcab65
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Sep 23 15:14:36 2007 +0200

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

commit f54383fea028792d59b3ac845c3fbeb423ca1b4f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 15 12:30:15 2007 +0200

    netlink plugin: Don't fail if `IFLA_STATS' doesn't exist for an interface.
    
    Hopefully this fixes problems on my WRT ;)

commit 528a9dfd368b95c4f741827fe4e953124eb17270
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 15 11:58:52 2007 +0200

    wireless plugin: Correct the handling of cards returning signal and noise quality as percentage.