Merge pull request #29316 from basepi/merge-forward-2015.5

[2015.5] Merge forward from 2014.7 to 2015.5
This commit is contained in:
Colton Myers 2015-12-01 13:20:23 -07:00
commit 14e94b3593

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