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 #42121 from terminalmage/issue42114

Browse source 
Fix pillar.get when saltenv is passed
This commit is contained in:
Mike Place 2017-07-06 11:52:33 -05:00 • committed by GitHub
commit 8c0a83cbb5
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/pillar.py
View file

@ -110,7 +110,7 @@ def get(key,
default = ''
opt_merge_lists = __opts__.get('pillar_merge_lists', False) if \
merge_nested_lists is None else merge_nested_lists
pillar_dict = __pillar__ if saltenv is None else items(saltenv=saltenv)
pillar_dict = __pillar__ if saltenv is None else items(pillarenv=saltenv)
if merge:
if isinstance(default, dict):