ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 11:51:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

renames dict_combine to dict_merge in network_common (#26073)

Browse source
This commit is contained in:
Peter Sprygada 2017-06-25 18:46:41 -04:00 • committed by GitHub
parent 15beaed6bc
commit b12ca95824
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/network_common.py
View file

@ -227,7 +227,7 @@ def dict_diff(base, comparable):
return updates
def dict_combine(base, other):
def dict_merge(base, other):
""" Return a new dict object that combines base and other
This will create a new dict object that is a combination of the key/value
@ -250,7 +250,7 @@ def dict_combine(base, other):
if key in other:
item = other.get(key)
if item is not None:
combined[key] = dict_combine(value, other[key])
combined[key] = dict_merge(value, other[key])
else:
combined[key] = item
else: