From: Ruben Kerkhof Date: Wed, 22 Feb 2017 10:17:58 +0000 (+0100) Subject: Merge branch 'collectd-5.6' into collectd-5.7 X-Git-Tag: collectd-5.7.2~17 X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=e4504c3cc5582ab915903e1b4ba010545ffc8354 Merge branch 'collectd-5.6' into collectd-5.7 Conflicts: contrib/redhat/collectd.spec --- e4504c3cc5582ab915903e1b4ba010545ffc8354 diff --cc contrib/redhat/collectd.spec index d6ca90e7,4d8041fc..abad290e --- a/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: 3%{?dist} +Version: 5.7.1 - Release: 1%{?dist} ++Release: 2%{?dist} URL: https://collectd.org Source: https://collectd.org/files/%{name}-%{version}.tar.bz2 License: GPLv2 @@@ -2588,16 -2515,11 +2588,20 @@@ f %doc contrib/ %changelog - * Tue Jan 01 2017 Marc Fournier - 5.7.1-1 -* Wed Feb 22 2017 Ruben Kerkhof - 5.6.1-3 ++* Wed Feb 22 2017 Ruben Kerkhof - 5.7.1-2 + - Enable XFS support in df plugin ++- Fix bogus date in changelog ++ ++* Sun Jan 01 2017 Marc Fournier - 5.7.1-1 +- New upstream version + +* Tue Nov 29 2016 Ruben Kerkhof - 5.7.0-2 +- Disable redis plugin on RHEL 6, hiredis has been retired from EPEL6 -* Tue Nov 29 2016 Ruben Kerkhof - 5.6.1-2 -- Disable redis plugin on RHEL < 7, hiredis has been retired from EPEL6 +* Mon Oct 10 2016 Marc Fournier - 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 - 5.6.1-1 - New upstream version