From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Sat, 9 May 2015 22:13:19 +0000 (+0200)
Subject: Merge branch 'collectd-5.3' into collectd-5.4
X-Git-Tag: collectd-5.5.0~29^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9708614487ec93df67ad1095f3cf5a0987b9cc28;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-5.3' into collectd-5.4
---

9708614487ec93df67ad1095f3cf5a0987b9cc28
diff --cc contrib/redhat/collectd.spec
index 1c1e34c6f,e9e71d631..d3f267491
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -194,9 -183,9 +194,9 @@@
  # plugin zfs_arc disabled, requires FreeBSD/Solaris
  %define with_zfs_arc 0%{!?_without_zfs_arc:0}
  
- Summary:	Statistics collection daemon for filling RRD files
+ Summary:	statistics collection and monitoring daemon
  Name:		collectd
 -Version:	5.3.2
 +Version:	5.4.2
  Release:	1%{?dist}
  URL:		http://collectd.org
  Source:		http://collectd.org/files/%{name}-%{version}.tar.bz2