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

Merge list values from config files

Browse Source
This commit is contained in:
Beorn Facchini 2017-01-06 21:18:30 +11:00
parent 0441dac480
commit bfc7f9026c
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/config/__init__.py
View File

@ -1902,7 +1902,7 @@ def include_config(include, orig_path, verbose, exit_on_config_errors=False):
if include:
opts.update(include_config(include, fn_, verbose))
salt.utils.dictupdate.update(configuration, opts)
salt.utils.dictupdate.update(configuration, opts, True, True)
return configuration