Merge branch 'fix-a10d74f7' of git://github.com/sfromm/ansible into devel

Conflicts: library/setup
2013-04-23 13:52:31 -04:00 · 2013-04-23 13:52:31 -04:00 · 521375a7fe
parent c601e53fce 471fa6859e
commit 521375a7fe
1 changed files with 1 additions and 1 deletions
--- a/library/setup
+++ b/library/setup
@ -1057,7 +1057,7 @@ class LinuxNetwork(Network):
                    iface = words[-1]
                    if iface != device:
                        interfaces[iface] = {}
-                        interfaces[iface].update(self.facts[device])
+                        interfaces[iface].update(interfaces[device])
                    interfaces[iface]['ipv4'] = {'address': address,
                                                 'netmask': netmask,
                                                 'network': network}