Code review comment for lp://qastaging/~midokura/nova/network-refactoring-l2

Revision history for this message
Vish Ishaya (vishvananda) wrote :

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.

review: Needs Fixing

« Back to merge proposal