Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Wed, 22 Feb 2017 20:16:38 +0000 (21:16 +0100)
commitfb0cc621d4357bbe4a9dc36c7f055f46257ce57c
treeacc6bb2a4dba8f32b31a67e5837949d0f93e6594
parentc44f866db154793ce706a17ec815ffa642314414
parent14d94fb83e1e9487dc46415b4334e7217b9175e9
Merge branch 'collectd-5.7'
src/log_logstash.c
src/logfile.c