Code

Merge branch 'collectd-5.5' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Tue, 6 Sep 2016 06:08:01 +0000 (08:08 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 6 Sep 2016 06:08:01 +0000 (08:08 +0200)
commitb847e8ff2fd928813397466a941947c8fce66d66
tree6aae0af785b5c897b8f50d1919f37c0b9cb742b5
parentde6dd1339b0191713d13484dab95f031374fcc27
parentc2349cf65ba6ddf9517def5ab1f73706f5ce8e01
Merge branch 'collectd-5.5' into collectd-5.6
src/daemon/plugin.c
src/network.c