Attempt to merge lp:~jaypipes/nova/nova-virt-connection into lp:nova failed due to merge conflicts:
text conflict in nova/virt/connection.py
« Back to merge proposal
Attempt to merge lp:~jaypipes/nova/nova-virt-connection into lp:nova failed due to merge conflicts:
text conflict in nova/virt/ connection. py