Code

Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:28:56 +0000 (17:28 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 24 Feb 2017 16:28:56 +0000 (17:28 +0100)
1  2 
contrib/systemd.collectd.service
src/utils_match.c

index 8a1fc2706b60f35c9f98d516faa406febf756c9b,7bc15d7c6349bc95dadcc16d0bccdda98d279126..4e2f6ae48c85c824dfda9cb82e628c2d543cd3af
@@@ -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:
Simple merge