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

[Florian Forster]

 src/collectd.conf.in  |    4 +
 src/collectd.conf.pod |    8 +-
 src/rrdcached.c       |   38 ++++++-
 src/swap.c            |  336 +++++++++++++++++++++++++++++++------------------
 4 files changed, 259 insertions(+), 127 deletions(-)

New commits:
commit 0f5d1ee8c3fc787df12d72dfe1bbedaa9e80ed5f
Merge: 7e16c93 776e65a
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Feb 7 08:42:22 2011 +0100

    Merge branch 'ff/flush-rrdcached'

commit 7e16c9347076ef731476d4864add43f0049135c4
Merge: 6bd4bf7 60f3ab3
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Mon Feb 7 08:42:05 2011 +0100

    Merge branch 'ff/swap'

commit 776e65a46fb7e69931267b9a4380ec56cb325386
Author: Florian Forster <octo at noris.net>
Date:   Wed Feb 2 15:07:26 2011 +0100

    rrdcached plugin: Pass FLUSHes on to the caching daemon.

commit 60f3ab3bd0a8a87fbba1a6ea569c18f2d4208f30
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sat Jan 8 16:57:56 2011 +0100

    swap plugin: Implement the "ReportByDevice" for Linux.