Attempt to merge lp:~justin-fathomdb/nova/check-subprocess-exit-code into lp:nova failed due to merge conflicts:
text conflict in bin/nova-manage text conflict in nova/utils.py text conflict in nova/volume/service.py text conflict in tools/install_venv.py
« Back to merge proposal
Attempt to merge lp:~justin-fathomdb/nova/check-subprocess-exit-code into lp:nova failed due to merge conflicts:
text conflict in bin/nova-manage service. py venv.py
text conflict in nova/utils.py
text conflict in nova/volume/
text conflict in tools/install_