Resolve merge commit

This commit is contained in:
Michael DeHaan 2014-01-04 14:03:42 -05:00
parent 1c632af2c9
commit 87258f6d42

View file

@ -437,10 +437,6 @@ class PlayBook(object):
return {}
host_list = self._list_available_hosts(play.hosts)
if play.gather_facts is None:
host_list = [h for h in host_list if h not in self.SETUP_CACHE or 'module_setup' not in self.SETUP_CACHE[h]]
if len(host_list) == 0:
return {}
self.callbacks.on_setup()
self.inventory.restrict_to(host_list)