From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 12 Jul 2017 16:59:07 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~121
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=267bbc64779f9c7b32e063aac0df22be61bda6ae

Merge branch 'collectd-5.7'

Conflicts:
	contrib/systemd.collectd.service
---

267bbc64779f9c7b32e063aac0df22be61bda6ae
diff --cc contrib/systemd.collectd.service
index 853363d7,a3b689ac..6333d49a
--- a/contrib/systemd.collectd.service
+++ b/contrib/systemd.collectd.service
@@@ -30,9 -29,7 +30,7 @@@ ProtectHome=tru
  # By default, drop all capabilities:
  CapabilityBoundingSet=
  
- NoNewPrivileges=true
- 
 -# Tell systemd it will receive a notification from collectd over it's control
 +# Tell systemd it will receive a notification from collectd over its control
  # socket once the daemon is ready. See systemd.service(5) for more details.
  Type=notify