From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 22 Feb 2017 10:19:57 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~229
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2412d3ca76f7ac24e67543720c1d385188da0ce3

Merge branch 'collectd-5.7'

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

2412d3ca76f7ac24e67543720c1d385188da0ce3
diff --cc contrib/redhat/collectd.spec
index faf7ced7,abad290e..451589d1
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -246,7 -243,7 +246,7 @@@ Source:		https://collectd.org/files/%{n
  License:	GPLv2
  Group:		System Environment/Daemons
  BuildRoot:	%{_tmppath}/%{name}-%{version}-root
- BuildRequires:	libgcrypt-devel, kernel-headers, libcap-devel, which
 -BuildRequires:	libgcrypt-devel, kernel-headers, libtool-ltdl-devel, libcap-devel, which, xfsprogs-devel
++BuildRequires:	libgcrypt-devel, kernel-headers, libcap-devel, which, xfsprogs-devel
  Vendor:		collectd development team <collectd@verplant.org>
  
  %if 0%{?fedora} || 0%{?rhel} >= 7
@@@ -2632,15 -2588,13 +2632,19 @@@ f
  %doc contrib/
  
  %changelog
- * Tue Jan 01 2017 Marc Fournier <marc.fournier@camptocamp.com> - 5.7.1-1
+ * 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
  
 +* Sat Dec 31 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-4
 +- Add new ovs_events plugin
 +
 +* Sat Dec 31 2016 Ruben Kerkhof <ruben@rubenkerkhof.com> - 5.7.0-3
 +- Add new mcelog plugin
 +
  * 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