This branch fails to merge with lp:nova:
Text conflict in nova/wsgi.py Text conflict in tools/pip-requires 2 conflicts encountered.
« Back to merge proposal
This branch fails to merge with lp:nova:
Text conflict in nova/wsgi.py
Text conflict in tools/pip-requires
2 conflicts encountered.