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 pull request #34741 from rallytime/bp-34726

Browse Source 
Back-port #34726 to 2015.8
This commit is contained in:
Mike Place 2016-07-18 12:00:22 -06:00 committed by GitHub
commit 81f29006f2
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/utils/dictupdate.py
View File

@ -58,7 +58,8 @@ def update(dest, upd, recursive_update=True, merge_lists=False):
return dest
else:
try:
dest.update(upd)
for k in upd.keys():
dest[k] = upd[k]
except AttributeError:
# this mapping is not a dict
for k in upd: