author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
Wed, 12 Jul 2017 16:59:07 +0000 (18:59 +0200) | ||
committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
Wed, 12 Jul 2017 16:59:07 +0000 (18:59 +0200) |
Conflicts:
contrib/systemd.collectd.service
contrib/systemd.collectd.service
1 | 2 | |||
---|---|---|---|---|
contrib/systemd.collectd.service | patch | | diff1 | | diff2 | | blob | history |
src/ipc.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc contrib/systemd.collectd.service
index 853363d7b63cd9492759581c124ee3898c331b22,a3b689ac28c0248c2c4602c04324d940d2b03e5a..6333d49a211ac63ff4d4291273d0f5073e5b7619
# 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
diff --cc src/ipc.c
Simple merge