saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #33293 from twangboy/fix_33277_2015_8

Browse source 
Fix minion start retry on Windows (2015.8)
This commit is contained in:
Thomas S Hatch 2016-05-17 11:03:41 -06:00
commit e3eff27c55
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/scripts.py
View file

@ -118,11 +118,6 @@ def salt_minion():
if '' in sys.path:
sys.path.remove('')
if salt.utils.is_windows():
minion = salt.cli.daemons.Minion()
minion.start()
return
if '--disable-keepalive' in sys.argv:
sys.argv.remove('--disable-keepalive')
minion = salt.cli.daemons.Minion()