Merge branch 'collectd-5.7' into collectd-5.8
authorFlorian Forster <octo@collectd.org>
Sun, 10 Feb 2019 20:44:20 +0000 (21:44 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 10 Feb 2019 20:44:20 +0000 (21:44 +0100)
commit2700666217249cd4794dfc17b4ac3b28f3dca56b
tree31c31d4290cd66050f88abe01d46076a158b3530
parentd1fd866038d0cfcd07cf7ecacf9f43a4997d36a9
parent98e2a7f60066d1e1880de632f66a79764776812c
Merge branch 'collectd-5.7' into collectd-5.8
src/daemon/common.c
src/daemon/common_test.c
src/log_logstash.c
src/write_prometheus.c