Merge branch 'collectd-5.5' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Fri, 7 Oct 2016 06:51:29 +0000 (08:51 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 7 Oct 2016 06:51:29 +0000 (08:51 +0200)
commitd0408cb0dbef15d739a6b1cd047e9c94d7643329
tree81e1928ba7cb8c50129a56b457f6281faf3cc56a
parent8476effff293409ad4cb53d87af453ebbb61a064
parentf8232cfe5e140b6c89dbe736480ae547a0e04374
Merge branch 'collectd-5.5' into collectd-5.6
contrib/examples/myplugin.c
src/daemon/common.c
src/rrdcached.c
src/vserver.c