Merge conflict.

2b2b174f · Michael DeHaan · 3d44f7cd · 2b2b174f
Commit 2b2b174f authored Mar 16, 2014 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

library/system/setup
+2 -2

No files found.
--- a/library/system/setup
+++ b/library/system/setup
@@ -2305,8 +2305,8 @@ def ansible_facts(module):

 def run_setup(module):

-    setup_options = {}
-    facts = ansible_facts(module)
+    setup_options = dict(module_setup=True)
+    facts = ansible_facts()

    for (k, v) in facts.items():
        setup_options["ansible_%s" % k.replace('-', '_')] = v