Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/api/ec2/cloud.py
text conflict in nova/compute/api.py
text conflict in nova/compute/manager.py
text conflict in nova/image/glance.py
text conflict in nova/tests/test_cloud.py
text conflict in nova/virt/xenapi/vmops.py
Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/api/ ec2/cloud. py manager. py glance. py test_cloud. py xenapi/ vmops.py
text conflict in nova/compute/api.py
text conflict in nova/compute/
text conflict in nova/image/
text conflict in nova/tests/
text conflict in nova/virt/