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

Merge branch 'collectd-5.4'
---

b57d6e25aa792f0461aee4e5bd6d1838c478af50
diff --cc contrib/redhat/collectd.spec
index e023a3410,d3f267491..20f6dd5f2
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@@ -204,14 -185,16 +204,14 @@@
  %define with_tape 0%{!?_without_tape:0}
  # plugin tokyotyrant disabled, requires tcrdb.h
  %define with_tokyotyrant 0%{!?_without_tokyotyrant:0}
 +# plugin write_kafka disabled, requires librdkafka
 +%define with_write_kafka 0%{!?_without_write_kafka:0}
  # plugin write_mongodb disabled, requires libmongoc
  %define with_write_mongodb 0%{!?_without_write_mongodb:0}
 -# plugin write_redis disabled, requires credis
 -%define with_write_redis 0%{!?_without_write_redis:0}
  # plugin xmms disabled, requires xmms
  %define with_xmms 0%{!?_without_xmms:0}
 -# 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.4.2
  Release:	1%{?dist}