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

[Florian Forster]

 src/collectd.conf.in  |    7 ++++++
 src/collectd.conf.pod |   19 +++++++++++++--
 src/configfile.c      |    1 +
 src/plugin.c          |   64 ++++++++++++++++++++++++++++++++++++++++++++++++-
 src/utils_cache.c     |   10 ++++++++
 src/utils_cache.h     |    1 +
 6 files changed, 99 insertions(+), 3 deletions(-)

New commits:
commit 67411e0794cfcab38e322b2ebbe2e5207cbdd86a
Merge: c0a9b7b be0a3a6
Author: Florian Forster <octo at collectd.org>
Date:   Mon Sep 8 17:11:56 2014 +0200

    Merge remote-tracking branch 'github/master'

commit be0a3a6eeb3655d5559abe768c4027889d1ae979
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Fri Aug 29 17:07:18 2014 +0200

    improve CollectInternalStats's documentation

commit 4e5c84e8251b25b11b5df7ef3b66259436bdea69
Merge: 01f4a6e b2d20f9
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Sep 8 11:41:25 2014 +0200

    Merge remote-tracking branch 'origin/pr/691'

commit b2d20f9fa0735b15041bb4583a0ae16289cb717a
Author: Yves Mettier <ymettier at free.fr>
Date:   Tue Aug 26 13:02:49 2014 +0200

    renamed the option to CollectInternalStats; renamed 'internal' to 'collectd'; no more lock when not recording internal stats

commit c8549bcdac8b24b6931298c21ec945590b0240f2
Author: Yves Mettier <ymettier at free.fr>
Date:   Mon Aug 25 13:47:33 2014 +0200

    nb_values missing in types.db; renaming as cache_size

commit 5a7d86eb315a7dba3bb58a258819ce6273da8f34
Author: Yves Mettier <ymettier at free.fr>
Date:   Tue Aug 5 10:17:53 2014 +0200

    New InternalStatistics