> Brian, > > Looks good. I'm getting the following conflicts with nova trunk: > > Text conflict in nova/api/openstack/images.py > Text conflict in nova/tests/api/openstack/test_images.py
Oops. Disregard. Wrong branch.
« Back to merge proposal
> Brian, openstack/ images. py api/openstack/ test_images. py
>
> Looks good. I'm getting the following conflicts with nova trunk:
>
> Text conflict in nova/api/
> Text conflict in nova/tests/
Oops. Disregard. Wrong branch.