valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version Added for new apply_spm_config function

Browse Source
This commit is contained in:
rallytime 2015-09-10 08:42:33 -06:00
parent 9612a6c7ad
commit 685fa911e7
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/config.py
View File

@ -3003,6 +3003,9 @@ def spm_config(path):
def apply_spm_config(overrides, defaults):
'''
Returns the spm configurations dict.
.. versionadded:: 2015.8.1
'''
opts = defaults.copy()
if overrides: