From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 10 Jan 2017 22:01:43 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.1~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e37e426d6646d6ff99834461f00c3dd79fa85d43;p=collectd.git

Merge branch 'collectd-5.6' into collectd-5.7
---

e37e426d6646d6ff99834461f00c3dd79fa85d43
diff --cc contrib/redhat/collectd.spec
index 4fc76e11,33cc985e..bed3cc5e
--- a/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