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

[Florian Forster]

 ChangeLog             |   10 +++++++++-
 src/collectd.conf.pod |   14 +++++++-------
 src/types.db.pod      |    3 ++-
 3 files changed, 18 insertions(+), 9 deletions(-)

New commits:
commit 7e504c50768c77d78003e1e27afe6f9f81a85b85
Merge: 652bf01441baf806cc0e5aed34e0e58746dc73ea 4ed1a6084d08463f09ccecd50be1fb245d49231e
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jan 14 15:19:39 2010 +0100

    Merge branch 'collectd-4.8' into collectd-4.9
    
    Conflicts:
    	ChangeLog

commit 652bf01441baf806cc0e5aed34e0e58746dc73ea
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Jan 14 15:03:43 2010 +0100

    ChangeLog: Added fix in the processes plugin.

commit 4ed1a6084d08463f09ccecd50be1fb245d49231e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jan 13 17:55:02 2010 +0100

    ChangeLog: Updated for version 4.8.3.

commit 6732ba07293bd05b9c2b0202f9307e50565c0f6b
Merge: 33aeecfc2507da2619a5d6fbae18813b4bb42b25 75aa62d1e4fa19731f2a9182d6132d6d6feb90bc
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jan 13 15:52:12 2010 +0100

    Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8

commit 33aeecfc2507da2619a5d6fbae18813b4bb42b25
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jan 13 15:51:41 2010 +0100

    collectd.conf(5): Rephrase a weird sentence in the cURL-JSON documentation.

commit 4f22a78cb9808fbda2d7c7280378319d59d4614e
Author: Florian Forster <octo at huhu.verplant.org>
Date:   Wed Jan 13 15:51:02 2010 +0100

    collectd.conf(5): Remove trailing whitespace.

commit 75aa62d1e4fa19731f2a9182d6132d6d6feb90bc
Author: Sebastian Harl <sh at tokkee.org>
Date:   Wed Jan 13 13:21:47 2010 +0100

    types.db(5): Mention the types "ABSOLUTE" and "DERIVE" as well.