From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sun, 19 Feb 2017 12:07:39 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~232
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=446138394bb95c49d0e05ea440fbf63aefe84bab

Merge branch 'collectd-5.7'

Conflicts:
	contrib/redhat/collectd.spec
	src/Makefile.am
	src/dpdkstat.c
---

446138394bb95c49d0e05ea440fbf63aefe84bab
diff --cc contrib/redhat/collectd.spec
index 350c3579,d6ca90e7..faf7ced7
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -2632,12 -2588,9 +2632,15 @@@ f
  %doc contrib/
  
  %changelog
+ * Tue 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