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 remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

Browse source
This commit is contained in:
Colton Myers 2015-08-25 12:15:26 -06:00
commit 71c0898fb5
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/state.py
View file

@ -633,6 +633,9 @@ def sls(mods,
else:
__opts__['pillarenv'] = pillarenv
if saltenv is None:
saltenv = __opts__['environment'] or 'base'
if queue:
_wait(kwargs.get('__pub_jid'))
else: