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

[Florian Forster]

 COPYING               |   27 ++++++++++-----------
 configure.in          |   62 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/collectd.conf.pod |   14 +++++++++++
 src/utils_threshold.c |    2 +-
 4 files changed, 90 insertions(+), 15 deletions(-)

New commits:
commit d07f285d446bdb5abbb6294ef592c890f7515200
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Apr 15 16:57:46 2008 +0200

    collectd.conf(5): Document the `DataSource' option.

commit 173f0b2aa8b0ce5b5d43d9e719e3585f5f9786c7
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Apr 15 16:23:03 2008 +0200

    src/utils_threshold.c: Fix a simple typo.

commit 917343b099777d5aae031c5062b01e4d3a694b5a
Merge: 447e7c6c61998eec4fde4b489e4e1e2e32290b52 1584314f015f98abc61e74fdd6e47e200c8d02aa
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Apr 15 14:04:55 2008 +0200

    Merge branch 'collectd-4.3'

commit 1584314f015f98abc61e74fdd6e47e200c8d02aa
Merge: 3469385f04ffcfa2f4ef06d34ed4b24acb378b34 0c06f2fab0b95bee81d319883c4fb6e552e32de5
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Tue Apr 15 14:04:47 2008 +0200

    Merge branch 'collectd-4.2' into collectd-4.3

commit 0c06f2fab0b95bee81d319883c4fb6e552e32de5
Author: Florian Forster <sifnfors at informatik.stud.uni-erlangen.de>
Date:   Mon Apr 14 12:26:08 2008 +0200

    build system: Check if strtok_r needs _REENTRANT
    
    Resolves: #8

commit 0b4c21d702c278b1e5d8b7b3d334a0b6d4831edc
Merge: 0cacae1b594f4ca0fc98798d119bfbad8f3bc6f5 7af919ac4b76af981002875ff7bef99874f745b7
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Sun Apr 13 11:12:22 2008 +0200

    Merge branch 'collectd-4.2' of octo at verplant.org:/var/lib/git/collectd into collectd-4.2

commit 0cacae1b594f4ca0fc98798d119bfbad8f3bc6f5
Author: Florian Forster <octo at leeloo.lan.home.verplant.org>
Date:   Thu Apr 3 10:11:57 2008 +0200

    COPYING: Switched to a version with the new address of the FSF.