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 #27172 from rallytime/bp-27150

Browse source 
Back-port #27150 to 2015.5
This commit is contained in:
Mike Place 2015-09-17 11:25:51 -06:00
commit 7a34c7742d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/config.py
View file

@ -25,6 +25,7 @@ except Exception:
# Import salt libs
import salt.utils
import salt.utils.dictupdate
import salt.utils.network
import salt.syspaths
import salt.utils.validate.path
@ -908,7 +909,7 @@ def include_config(include, orig_path, verbose):
for fn_ in sorted(glob.glob(path)):
log.debug('Including configuration from {0!r}'.format(fn_))
configuration.update(_read_conf_file(fn_))
salt.utils.dictupdate.update(configuration, _read_conf_file(fn_))
return configuration