Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/api/openstack/common.py text conflict in nova/db/sqlalchemy/api.py
« Back to merge proposal
Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/api/ openstack/ common. py sqlalchemy/ api.py
text conflict in nova/db/