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 
Conflicts:
    salt/client/ssh/wrapper/pillar.py
This commit is contained in:
Colton Myers 2015-05-19 15:23:37 -06:00
commit 36f0065faf
2 changed files with 1354 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1357
doc/topics/releases/2014.7.6.rst
View file

File diff suppressed because it is too large Load diff

4
salt/client/ssh/wrapper/pillar.py
View file

@ -37,12 +37,12 @@ def get(key, default='', merge=False, delimiter=DEFAULT_TARGET_DELIM):
Specify whether or not the retrieved values should be recursively
merged into the passed default.
.. versionadded:: 2014.7.0
.. versionadded:: 2015.5.0
delimiter
Specify an alternate delimiter to use when traversing a nested dict
.. versionadded:: 2014.7.0
.. versionadded:: 2015.5.0
CLI Example: