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

[Florian Forster]

 contrib/curl_json/php-fpm.conf |   27 +++++++++++++++++++++++++++
 src/collectd.conf.pod          |    5 +++++
 src/curl_json.c                |    7 ++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit c5a2b1153577f3322bf14215c616326b731a5c51
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Thu Feb 25 21:44:02 2016 +0700

    curl_json: Added example configuration for PHP-FPM.

commit 23128c9c41d00cd2e5e3f529f1792a261affd0a4
Author: Pavel Rochnyack <pavel2000 at ngs.ru>
Date:   Thu Feb 25 21:31:46 2016 +0700

    curl_json: Add ability to set custom plugin name in collected data.