Attempt to merge lp:~ewanmellor/nova/xenapi-concurrency-model into lp:nova failed due to merge conflicts:
text conflict in nova/virt/xenapi.py
« Back to merge proposal
Attempt to merge lp:~ewanmellor/nova/xenapi-concurrency-model into lp:nova failed due to merge conflicts:
text conflict in nova/virt/xenapi.py