Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 5 Aug 2016 11:12:03 +0000 (13:12 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 5 Aug 2016 11:12:03 +0000 (13:12 +0200)
commit7bfda8d327240ac73297e4449663814dd0594be5
treeab963ac2b776414b2fadfed03b5a71a9c2847c1e
parentdc2eb041159b967838a2eb658cb256bc846c5264
parenteae3f57d9a826e015ef952c746675c2aff8592dc
Merge branch 'collectd-5.4' into collectd-5.5
src/daemon/plugin.c
src/network.c