Dag Wieers aeaddc5559 Backport combine_vars() logic from Ansible v2.0 ... While debugging I noticed that _validate_both_dicts() was evaluated twice through combine_vars (when merge_hash). Looking at v2.0 the logic was improved to not do _validate_both_dicts() twice in this case. I also backported the 'update' behaviour as it looks more pythonic.		2016-02-18 16:48:15 +01:00
..
ansible	Backport combine_vars() logic from Ansible v2.0	2016-02-18 16:48:15 +01:00