Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Wed, 28 Sep 2016 20:13:08 +0000 (22:13 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 28 Sep 2016 20:13:08 +0000 (22:13 +0200)
commitf2f7049e8faff8043b12d7c7548d9398d3b3ada4
tree7621234b3608681c1016984eaaf09e702ccb269f
parent93a92aa8b9e44fdaa6c3493639709e7fb1fa3c4c
parent69d058a6ce8557e24b604b8efb09136e02054bd0
Merge branch 'collectd-5.6'
src/daemon/plugin.c
src/daemon/plugin.h
src/write_graphite.c
src/write_http.c