Merge branch 'collectd-5.8'
authorFlorian Forster <octo@collectd.org>
Sun, 10 Feb 2019 20:50:51 +0000 (21:50 +0100)
committerFlorian Forster <octo@collectd.org>
Sun, 10 Feb 2019 21:01:25 +0000 (22:01 +0100)
commit711f5b6c86f51061c21bedcaa46214a01de0125c
tree79b9743fc918c1582f41deb01bf7554d57b9d2c5
parente19d1f0affb0b68e11c9ed3448b3d5a663bb0049
parent2700666217249cd4794dfc17b4ac3b28f3dca56b
Merge branch 'collectd-5.8'

Conflicts:
src/sensors.c
src/collectd.conf.pod
src/daemon/common.c
src/log_logstash.c
src/sensors.c
src/write_prometheus.c