internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

corrected merge vs combined in all pertinent sections

Browse Source
This commit is contained in:
Brian Coca
2015-02-24 05:14:22 -05:00
parent e59b364641
commit ce764063f1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/runner/__init__.py
View File

@@ -608,7 +608,7 @@ class Runner(object):
def get_combined_cache(self):
# merge the VARS and SETUP caches for this host
combined_cache = self.setup_cache.copy()
return utils.merge_hash(combined_cache, self.vars_cache)
return utils.combine_vars(combined_cache, self.vars_cache)
def get_inject_vars(self, host):
host_variables = self.inventory.get_variables(host, vault_password=self.vault_pass)