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 #26641 from basepi/merge-forward-2015.5

Browse source 
[2015.5] Merge forward from 2014.7 to 2015.5
This commit is contained in:
Colton Myers 2015-08-25 12:17:46 -06:00
commit 19c7a6d575
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/state.py
View file

@ -619,7 +619,7 @@ def sls(mods,
)
# Backwards compatibility
saltenv = env
if not saltenv:
if saltenv is None:
if __opts__.get('environment', None):
saltenv = __opts__['environment']
else: