Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 26 Nov 2015 13:22:20 +0000 (14:22 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 26 Nov 2015 13:22:20 +0000 (14:22 +0100)
commitfc6f1e3d33d646391adb5cedc62e7b3904c15003
tree0b7633e995fc850f30131029dc17cfe5f072c23b
parent817e080279469498c446bff54dbc7e0633cb238c
parent007d96fe10beb6c6d4f20c79851404be18a3418f
Merge branch 'collectd-5.4' into collectd-5.5
src/apache.c
src/daemon/common.c
src/daemon/meta_data.c
src/daemon/utils_avltree.c
src/statsd.c