Attempt to merge lp:~vishvananda/nova/orm_deux into lp:nova failed due to merge conflicts:
contents conflict in nova/compute/service.py text conflict in nova/tests/cloud_unittest.py text conflict in nova/tests/volume_unittest.py
« Back to merge proposal
Attempt to merge lp:~vishvananda/nova/orm_deux into lp:nova failed due to merge conflicts:
contents conflict in nova/compute/ service. py cloud_unittest. py volume_ unittest. py
text conflict in nova/tests/
text conflict in nova/tests/