Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

This commit is contained in:
Colton Myers 2015-12-01 13:19:39 -07:00
commit 33f40b3c47

View file

@ -5,6 +5,7 @@ After=syslog.target network.target
[Service]
Type=notify
ExecStart=/usr/bin/salt-master
KillMode=process
[Install]
WantedBy=multi-user.target