lp:~rackspace-titan/glance/multiple-content-types-lp800947

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/glance/trunk at revision 144

Jay Pipes (community): Approve on 2011-06-26

Mark Washenberger (community): Approve on 2011-06-25

Diff: 81 lines (+10/-9)

3 files modified

glance/api/v1/images.py (+7/-7)
tests/functional/test_httplib2_api.py (+1/-2)
tests/unit/test_api.py (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #800947: Incorrect content-type returned on GET '/v1/images/<id>'

Undecided

Fix Released

Link a bug report

Related blueprints

146. By Brian Waldon on 2011-06-24

fixing httplib2 functional test that was expecting wrong content-type value

145. By Brian Waldon on 2011-06-24

merging trunk

144. By Brian Waldon on 2011-06-24

adding assert to check content_type in GET /images/<id> test

143. By Brian Waldon on 2011-06-24

Explicitly setting Content-Type, Content-Length, ETag, Location headers to prevent duplication

142. By Ewan Mellor on 2011-06-24

Bug #801703: No logging is configured for unit tests

Configure logging to go to stderr during the unit test run. This gets
captured by run_tests.sh into run_tests.err.log.

141. By Brian Waldon on 2011-06-21

Fixes build failures due to webob upgrade. Updated pop-requires as well

140. By Brian Waldon on 2011-06-21

- refactoring wsgi code to divide deserialization, controller, serialization among different objects
- Resource object acts as coordinator

- tests are coming, this is for review purposes

139. By Brian Waldon on 2011-05-31

Adding support for marker/limit query params from api, through registry client/api, and implementing at registry db api layer

138. By Ewan Mellor on 2011-05-31

Bug #787296: test_walk_versions fails with SQLalchemy 0.7

Cap SQLalchemy and sqlalchemy-migrate at 0.6.x. This works around the
problem where test_walk_versions fails with 0.7.

It's obviously not a long-term fix.

137. By Donal Lafferty on 2011-05-31

Added new disk_format type of 'iso'. Nova can use this information to identify images that have to be booted from a CDROM.

Added unit test to uploading correct and bad image metadata, and of a get of image data.

Updated docs in three locations where 'raw' disk format was expalined. However, no examples of 'iso' were in headers or API calls added.