diff options
| author | Peter Sprygada <privateip@users.noreply.github.com> | 2017-06-26 00:46:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 00:46:41 +0200 |
| commit | b12ca95824b139598ff51f34bc0904a2105d31ff (patch) | |
| tree | e7d9ea4ce42495fed5b712dee0a68980a0146505 /lib | |
| parent | Update FreeBSD pg test to use postgresql95-server. (diff) | |
| download | ansible-b12ca95824b139598ff51f34bc0904a2105d31ff.tar.xz ansible-b12ca95824b139598ff51f34bc0904a2105d31ff.zip | |
renames dict_combine to dict_merge in network_common (#26073)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ansible/module_utils/network_common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/module_utils/network_common.py b/lib/ansible/module_utils/network_common.py index 32d831b88f..485fa947f4 100644 --- a/lib/ansible/module_utils/network_common.py +++ b/lib/ansible/module_utils/network_common.py @@ -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: |