From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 24 Feb 2017 16:28:56 +0000 (+0100)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~223
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=64b8150edec2271bb110f36e70915fdd87d9cac2;p=collectd.git

Merge branch 'collectd-5.7'
---

64b8150edec2271bb110f36e70915fdd87d9cac2
diff --cc contrib/systemd.collectd.service
index 8a1fc270,7bc15d7c..4e2f6ae4
--- a/contrib/systemd.collectd.service
+++ b/contrib/systemd.collectd.service
@@@ -18,9 -18,9 +18,10 @@@ ProtectHome=tru
  #   ceph            CAP_DAC_OVERRIDE
  #   dns             CAP_NET_RAW
  #   exec            CAP_SETUID CAP_SETGID
 +#   intel_rdt       CAP_SYS_RAWIO
  #   iptables        CAP_NET_ADMIN
  #   ping            CAP_NET_RAW
+ #   smart           CAP_SYS_RAWIO
  #   turbostat       CAP_SYS_RAWIO
  #
  # Example, if you use the iptables plugin alongside the dns or ping plugin: