Attempt to merge lp:~gundlach/nova/rsapi-pagination into lp:nova failed due to merge conflicts:
text conflict in nova/api/rackspace/flavors.py
« Back to merge proposal
Attempt to merge lp:~gundlach/nova/rsapi-pagination into lp:nova failed due to merge conflicts:
text conflict in nova/api/ rackspace/ flavors. py