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

[Florian Forster]

 ChangeLog     |    2 ++
 configure.in  |   37 +++++++++++++++++++++++++++++++++++++
 src/netlink.c |   46 +++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 80 insertions(+), 5 deletions(-)

New commits:
commit 7ca2b1a1627d7fd14348247c846d6f10342a70d5
Merge: f0c4eb8af9128f960f1d7dff62ef2305bbc7724a 756704084860d8ad21db61f2a677cbd80b008be4
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 15 11:01:59 2007 +0200

    Merge branch 'collectd-4.1'

commit 756704084860d8ad21db61f2a677cbd80b008be4
Merge: 5d26a6607fc53f416e42dccbc3fcda5d9b142625 7e5df1a2c6611bd4ac9fb8ac4b78106f9139ae6e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 15 11:01:40 2007 +0200

    Merge branch 'collectd-4.0' into collectd-4.1

commit 7e5df1a2c6611bd4ac9fb8ac4b78106f9139ae6e
Merge: f709381fdef43b1857ffb72c2a2721b2a75ecd71 8cc583bb44d46a2333b92d8ff4619fce2de5f30f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 15 11:01:19 2007 +0200

    Merge branch 'collectd-3.11' into collectd-4.0
    
    Conflicts:
    
    	src/apcups.c
    
    nothing added to commit but untracked files present (use "git add" to track)

commit 8cc583bb44d46a2333b92d8ff4619fce2de5f30f
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 15 10:58:53 2007 +0200

    apcups plugin: Warn about the irritating name `apcups_charge_pct'.

commit 5d26a6607fc53f416e42dccbc3fcda5d9b142625
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Sep 15 10:48:25 2007 +0200

    netlink plugin: Fix build issues under Debian Sarge
    
    or generally older Linux versions.

commit f709381fdef43b1857ffb72c2a2721b2a75ecd71
Merge: be489141988ff91b2d0034454724f0917393b678 6e84354ee29495e07bce5884fa4c7f15cd5b7d4e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 14 09:15:06 2007 +0200

    Merge branch 'ff/apcups' into collectd-4.0