lp:~rackspace-titan/nova/image-service-cleanup

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 1561

Dan Prince (community): Approve on 2011-09-13

Brian Lamar (community): Approve on 2011-09-13

Jay Pipes (community): Approve on 2011-09-07

Rick Harris (community): Approve on 2011-09-07

Vish Ishaya (community): Approve on 2011-09-06

Diff: 2702 lines (+861/-1160)

12 files modified

nova/api/ec2/cloud.py (+1/-1)
nova/api/openstack/image_metadata.py (+28/-30)
nova/api/openstack/images.py (+1/-1)
nova/image/fake.py (+1/-2)
nova/image/glance.py (+52/-28)
nova/image/s3.py (+1/-2)
nova/image/service.py (+0/-200)
nova/tests/api/openstack/fakes.py (+40/-87)
nova/tests/api/openstack/test_image_metadata.py (+65/-102)
nova/tests/api/openstack/test_images.py (+216/-458)
nova/tests/glance/stubs.py (+68/-0)
nova/tests/image/test_glance.py (+388/-249)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #744457: Documentation of nova/image/service.py is incorrect	Low	Invalid
Bug #838372: ImageService should not map unknown attributes to metadata	Medium	Fix Released

Link a bug report

Related blueprints

1534. By Brian Waldon on 2011-09-12

merging trunk; resolving conflicts

1533. By Brian Waldon on 2011-09-12

merging trunk; resolving conflicts

1532. By Brian Waldon on 2011-09-12

merging parent branch lp:~rackspace-titan/nova/glance-client-keystone

1531. By Brian Waldon on 2011-09-12

merging trunk

1530. By Brian Waldon on 2011-09-09

merging trunk

1529. By Brian Waldon on 2011-09-08

merging trunk

1528. By Brian Waldon on 2011-09-08

merging trunk

1527. By Brian Waldon on 2011-09-06

reverting change to GlanceImageService._is_image_available

1526. By Brian Waldon on 2011-09-06

reverting xenapi change

1525. By Brian Waldon on 2011-09-06

further cleanup