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

[Florian Forster]

 ChangeLog                   |   10 ++++++++
 configure.in                |    2 -
 contrib/PerlLib/Collectd.pm |    2 -
 src/apcups.c                |    2 -
 src/collectd-snmp.pod       |   20 +++++++++++++++++
 src/snmp.c                  |   49 +++++++++++++++++++++++++++++++++++++++-----
 version-gen.sh              |    2 -
 7 files changed, 78 insertions(+), 9 deletions(-)

New commits:
commit f0c4eb8af9128f960f1d7dff62ef2305bbc7724a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 14 09:51:29 2007 +0200

    snmp plugin: Added the options `Scale' and `Shift' to Data-blocks..
    
    ..to correct the values returned by SNMP-agents.

commit c99e8cb5de527e70bb9bbef0217eecd025403603
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Fri Sep 14 09:11:04 2007 +0200

    Bumped the version to 4.1.1

commit 395e2cc2472a52b4de1384421b18a25eac5556a8
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Fri Sep 14 08:32:37 2007 +0200

    build system: Fix yet another issue with the detection of libupsclient.

commit e6fc1600ee7bcde75c95db9b1f617caf78fc4c6a
Merge: 97deb523823b1f04880d584a19bc2b0e7e10d96a 6e84354ee29495e07bce5884fa4c7f15cd5b7d4e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Sep 13 10:01:23 2007 +0200

    Merge branch 'collectd-4.0' into collectd-4.1
    
    Conflicts:
    
    	ChangeLog

commit 6e84354ee29495e07bce5884fa4c7f15cd5b7d4e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Thu Sep 13 09:56:04 2007 +0200

    apcups plugin: Fix reporting of the `load percent' data.

commit 97deb523823b1f04880d584a19bc2b0e7e10d96a
Merge: 90ac9957e95378d729bce1c00bb0ef2efadab33e be489141988ff91b2d0034454724f0917393b678
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Sep 12 14:57:43 2007 +0200

    Merge branch 'collectd-4.0' into collectd-4.1
    
    Conflicts:
    
    	contrib/PerlLib/Collectd.pm
    
    nothing added to commit but untracked files present (use "git add" to track)

commit be489141988ff91b2d0034454724f0917393b678
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Wed Sep 12 14:45:30 2007 +0200

    contrib/PerlLib/Collectd.pm: Bumbed the version to 4.0.8.