From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Fri, 29 Aug 2014 15:26:41 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.4.2~19
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=1894607dc4c03ce20db7c5256c97890aa70bcaa5

Merge branch 'collectd-5.3' into collectd-5.4

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

1894607dc4c03ce20db7c5256c97890aa70bcaa5
diff --cc contrib/redhat/collectd.spec
index 43704c4f,6c733251..7d60f7de
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -2025,15 -1892,6 +2029,12 @@@ f
  %doc contrib/
  
  %changelog
 +* Mon Aug 19 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.4.0-1
 +- New upstream version
 +- Build netlink plugin by default
 +- Enable cgroups, lvm and statsd plugins
 +- Enable (but don't build by default) mic, aquaero and sigrok plugins
 +
- * Wed Aug 06 2014 Marc Fournier <marc.fournier@camptocamp.com> 5.3.1-2
- - Enabled modbus plugin
- 
  * Tue Aug 06 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.3.1-1
  - New upstream version
  - Added RHEL5 support: