Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/api/openstack/create_instance_helper.py text conflict in nova/compute/api.py text conflict in nova/tests/api/openstack/test_servers.py
« Back to merge proposal
Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/api/ openstack/ create_ instance_ helper. py api/openstack/ test_servers. py
text conflict in nova/compute/api.py
text conflict in nova/tests/