Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/compute/manager.py
« Back to merge proposal
Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/compute/ manager. py