looks like a merge conflict created by the multiple dns fix:
274 +<<<<<<< TREE 275 'dns': [], 276 'ips': [ip_dict(ip) for ip in network_IPs]} 277 +======= 278 + 'dns': [network['dns']], 279 + 'ips': [ip_dict(ip) for ip in network_IPs], 280 + 'should_create_bridge': self.SHOULD_CREATE_BRIDGE, 281 + 'should_create_vlan': self.SHOULD_CREATE_VLAN} 282 +>>>>>>> MERGE-SOURCE
Code looks good. I'm doing a quick test to make sure that I can still run multi_host networks. I will post the results shortly.
« Back to merge proposal
looks like a merge conflict created by the multiple dns fix:
274 +<<<<<<< TREE create_ bridge' : self.SHOULD_ CREATE_ BRIDGE, create_ vlan': self.SHOULD_ CREATE_ VLAN}
275 'dns': [],
276 'ips': [ip_dict(ip) for ip in network_IPs]}
277 +=======
278 + 'dns': [network['dns']],
279 + 'ips': [ip_dict(ip) for ip in network_IPs],
280 + 'should_
281 + 'should_
282 +>>>>>>> MERGE-SOURCE
Code looks good. I'm doing a quick test to make sure that I can still run multi_host networks. I will post the results shortly.