Merge lp://qastaging/~ewanmellor/nova/lp617776 into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
Ewan Mellor
| Status: | Merged |
|---|---|
| Approved by: | Jesse Andrews |
| Approved revision: | 229 |
| Merged at revision: | 229 |
| Proposed branch: | lp://qastaging/~ewanmellor/nova/lp617776 |
| Merge into: | lp://qastaging/~hudson-openstack/nova/trunk |
| Diff against target: |
50 lines (+19/-3) 2 files modified
nova/objectstore/handler.py (+17/-1) nova/objectstore/image.py (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~ewanmellor/nova/lp617776 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Todd Willey (community) | Approve | ||
| Jesse Andrews (community) | Approve | ||
|
Review via email:
|
|||
Commit message
improve compatibility of ec2 api
Description of the change
Bug #617776: DescribeImagesR
Make the objectstore respond with the field 'imageType' as well as 'type'.
The former is the correct one, according to the EC2 API specification for
the DescribeImages response. The latter is for compatibility with euca2ools
and other clients.
To post a comment you must log in.
Revision history for this message
| Todd Willey (xtoddx) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
lgtm