When attempting the merge, I get a conflict in nova/compute/linux_net.py. Fix that, and I'll approve the merge.
« Back to merge proposal
When attempting the merge, I get a conflict in nova/compute/ linux_net. py. Fix that, and I'll approve the merge.