Couple of conflicts now w/ a trunk merge too:
Text conflict in nova/volume/api.py Text conflict in nova/volume/manager.py 2 conflicts encountered.
« Back to merge proposal
Couple of conflicts now w/ a trunk merge too:
Text conflict in nova/volume/api.py manager. py
Text conflict in nova/volume/
2 conflicts encountered.