diff options
Diffstat (limited to 'lib/ansible/utils/vars.py')
| -rw-r--r-- | lib/ansible/utils/vars.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/utils/vars.py b/lib/ansible/utils/vars.py index 73ba52b4b3..01eb5ac821 100644 --- a/lib/ansible/utils/vars.py +++ b/lib/ansible/utils/vars.py @@ -86,7 +86,7 @@ def merge_hash(a, b): for k, v in iteritems(b): # if there's already such key in a # and that key contains a MutableMapping - if k in result and isinstance(result[k], MutableMapping): + if k in result and isinstance(result[k], MutableMapping) and isinstance(v, MutableMapping): # merge those dicts recursively result[k] = merge_hash(result[k], v) else: |