Merge branch 'collectd-5.6' into collectd-5.7

diff --cc contrib/redhat/collectd.spec
index 4fc76e11c4c54bfb6b01386afb1543e1eb6a5a29,33cc985e421b85fa9ebdd335aaffd37845927b74..bed3cc5e975effecb614025e3a8ce6eaee757702
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -148,8 -147,8 +148,9 @@@
  %define with_write_graphite 0%{!?_without_write_graphite:1}
  %define with_write_http 0%{!?_without_write_http:1}
  %define with_write_log 0%{!?_without_write_log:1}
 +%define with_write_prometheus 0%{!?_without_write_prometheus:1}
  %define with_write_redis 0%{!?_without_write_redis:1}
+ %define with_write_riemann 0%{!?_without_write_riemann:1}
  %define with_write_sensu 0%{!?_without_write_sensu:1}
  %define with_write_tsdb 0%{!?_without_write_tsdb:1}
  %define with_xmms 0%{!?_without_xmms:0%{?_has_xmms}}
@@@ -218,8 -211,8 +217,9 @@@
  %define with_redis 0
  %define with_smart 0
  %define with_turbostat 0
 +%define with_write_prometheus 0
  %define with_write_redis 0
+ %define with_write_riemann 0
  %endif
  
  # Plugins not buildable on RHEL < 7

diff --cc src/Makefile.am
Simple merge