Merge branch 'collectd-5.6' into collectd-5.7

Conflicts:
	contrib/redhat/collectd.spec

diff --cc contrib/redhat/collectd.spec
index abad290,5181293..1cf2e31
--- 1/contrib/redhat/collectd.spec
--- 2/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -236,8 -229,8 +236,8 @@@
  
  Summary:      Statistics collection and monitoring daemon
  Name:         collectd
 -Version:      5.6.1
 -Release:      4%{?dist}
 +Version:      5.7.1
- Release:      2%{?dist}
++Release:      3%{?dist}
  URL:          https://collectd.org
  Source:               https://collectd.org/files/%{name}-%{version}.tar.bz2
  License:      GPLv2
@@@ -2588,20 -2516,14 +2589,23 @@@ f
  %doc contrib/
  
  %changelog
 -* Sun Mar 05 2017 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-4
++* Sun Mar 05 2017 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.1-2
+ - Don't enable XFS support on RHEL6, it is missing for i386
+ 
 -* Wed Feb 22 2017 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.6.1-3
 +* Wed Feb 22 2017 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.1-2
  - Enable XFS support in df plugin
 +- Fix bogus date in changelog
 +
 +* Sun Jan 01 2017 Marc Fournier <marc.fournier@camptocamp.com> - 5.7.1-1
 +- New upstream version
 +
 +* 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
  
 -* 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
 +* 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