Merge branch 'downstream' into devel

This commit is contained in:
Ryan Petrello
2020-05-08 16:48:48 -04:00
23 changed files with 11276 additions and 9788 deletions

View File

@@ -58,7 +58,7 @@ data:
autostart = true
autorestart = true
stopwaitsecs = 5
stopsignal=KILL
stopsignal=TERM
stopasgroup=true
killasgroup=true
redirect_stderr=true