Merge branch 'collectd-5.4'

diff --cc configure.ac
Simple merge

diff --cc contrib/redhat/collectd.spec
index e023a34100532536a385e8fcddca219642e5610e,d3f267491df5d67a702290e440c4448dcccc55b7..20f6dd5f215e8554c808beae5da556423df9374b
--- 1/contrib/redhat/collectd.spec
--- 2/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}

diff --cc src/daemon/meta_data.c
Simple merge

diff --cc src/processes.c
Simple merge

diff --cc src/swap.c
Simple merge