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

Conflicts:
	library/setup
reviewable/pr18780/r1
Michael DeHaan 12 years ago
commit e2d1b5aac2

@ -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}

Loading…
Cancel
Save