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

Merge branch 'collectd-5.6' into collectd-5.7

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

2e632b0929fb957fd686231658bc2999fdfb4b20
diff --cc contrib/redhat/collectd.spec
index 74c02ea7,e7ffb077..4fc76e11
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -233,8 -228,8 +235,8 @@@
  
  Summary:	Statistics collection and monitoring daemon
  Name:		collectd
 -Version:	5.6.1
 +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,10 -2514,8 +2587,13 @@@ f
  %doc contrib/
  
  %changelog
 -* Tue Nov 29 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-2
 -- Disable redis plugin on RHEL < 7, hiredis has been retired from EPEL6
++* 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
 +- New plugins disabled by default: dpdkstat, intel_rdt
  
  * Mon Oct 10 2016 Victor Demonchy <v.demonchy@criteo.com> - 5.6.1-1
  - New upstream version