From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 29 Nov 2016 11:38:59 +0000 (+0100)
Subject: Merge branch 'collectd-5.6' into collectd-5.7
X-Git-Tag: collectd-5.7.0~7
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2e632b0929fb957fd686231658bc2999fdfb4b20;hp=6c17c8ccba745714c4d7cc10dc3ca57f2d0d293f

Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
	contrib/redhat/collectd.spec
---

diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
index 74c02ea7..4fc76e11 100644
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@ -227,14 +227,16 @@
 %define with_cpusleep 0
 %define with_gps 0
 %define with_mqtt 0
+%define with_redis 0
 %define with_rrdcached 0
+%define with_write_redis 0
 %define with_xmms 0
 %endif
 
 Summary:	Statistics collection and monitoring daemon
 Name:		collectd
 Version:	5.7.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 URL:		https://collectd.org
 Source:		https://collectd.org/files/%{name}-%{version}.tar.bz2
 License:	GPLv2
@@ -2585,6 +2587,9 @@ fi
 %doc contrib/
 
 %changelog
+* Tue Nov 29 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-2
+- Disable redis plugin on RHEL 6, hiredis has been retired from EPEL6
+
 * Mon Oct 10 2016 Marc Fournier <marc.fournier@camptocamp.com> - 5.7.0-1
 - New PRE-RELEASE version
 - New plugins enabled by default: hugepages, write_prometheus