valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19341 from Lacrymology/safe-pillar-get

Browse Source 
fix docstring for pillar.get
This commit is contained in:
Thomas S Hatch 2015-01-05 13:24:43 -07:00
commit 6f13509cc0
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

@ -25,7 +25,7 @@ def get(key, default=KeyError, merge=False, delimiter=DEFAULT_TARGET_DELIM):
Attempt to retrieve the named value from pillar, if the named value is not Attempt to retrieve the named value from pillar, if the named value is not
available return the passed default. The default return is an empty string available return the passed default. The default return is an empty string
except __opts__['PILLAR_RAISE_ON_MISSING'] is set to True, in which case a except __opts__['pillar_raise_on_missing'] is set to True, in which case a
KeyError will be raised. KeyError will be raised.
If the merge parameter is set to ``True``, the default will be recursively If the merge parameter is set to ``True``, the default will be recursively