Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 20:09:46 +0000 (21:09 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 20:09:46 +0000 (21:09 +0100)
commit14d94fb83e1e9487dc46415b4334e7217b9175e9
treef158b89cdceeab45ad9fcd41e7de72acc62a06b9
parente4504c3cc5582ab915903e1b4ba010545ffc8354
parent25a2a0a9204610245b245656c91ad326725ef72d
Merge branch 'collectd-5.6' into collectd-5.7
src/daemon/collectd.c
src/log_logstash.c
src/logfile.c