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

[Florian Forster]

 ChangeLog             |    1 +
 configure.in          |    2 +-
 src/collectd.conf.pod |   35 ++++++-
 src/common.c          |    4 +-
 src/swap.c            |  279 ++++++++++++++++++++++++++++++++++++++++++-------
 5 files changed, 281 insertions(+), 40 deletions(-)

New commits:
commit 54db9562401c26c9ac4522c6edeb12604dc11aaf
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Dec 6 11:13:09 2010 +0100

    swap plugin: Implement virtual / physical reporting on Solaris.

commit 565c731a4353d1453b65dc9a4267e1f8e4740c06
Merge: aff8083 dbcb061
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Dec 6 09:31:34 2010 +0100

    Merge branch 'collectd-4.10'

commit dbcb0610ae7dfa0155b04aa4174ec35a1058d18e
Merge: bd60385 84e8922
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Dec 6 09:31:15 2010 +0100

    Merge branch 'collectd-4.9' into collectd-4.10

commit 84e8922c9ca797a43463feb53c2053e150d31bb2
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sun Dec 5 12:05:18 2010 +0100

    src/common.c: parse_value: Fix assignment of derive and absolute values.

commit 296384e956f728c636f9284b59330472e409c15f
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sat Dec 4 09:30:47 2010 +0100

    configure.in: Fix a typo in an AC_ARG_WITH description.

commit bd6038590ee2b3de949ff087bc4a9214613b97b1
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Sun Nov 28 08:36:39 2010 +0100

    ChangeLog: Add missing line (copynpaste error).