Merge lp://staging/~vishvananda/nova/lp767849 into lp://staging/~hudson-openstack/nova/trunk

Proposed by Vish Ishaya
Status: Merged
Approved by: Jay Pipes
Approved revision: 1008
Merged at revision: 1010
Proposed branch: lp://staging/~vishvananda/nova/lp767849
Merge into: lp://staging/~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
nova/api/ec2/cloud.py (+1/-1)
To merge this branch: bzr merge lp://staging/~vishvananda/nova/lp767849
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
termie (community) Approve
Review via email: mp+58597@code.staging.launchpad.net

Description of the change

Makes metadata correctly display kernel-id and ramdisk-id.

References from the Database don't support "in".

To post a comment you must log in.
Revision history for this message
termie (termie) wrote :

I'd almost argue that we should support 'in' (and/or just return the dict version instead). Thoughts?

I think this is fine as is, but maybe worth the other idea.

review: Approve
Revision history for this message
Vish Ishaya (vishvananda) wrote :

Yes, in should be supported. I think sanitizing to dict at the db layer is probably the best idea, but there is going to be discussion at the summit about dicts vs objects, so I just worked around it for now.

Vish

On Apr 20, 2011, at 5:01 PM, termie wrote:

> Review: Approve
> I'd almost argue that we should support 'in' (and/or just return the dict version instead). Thoughts?
>
> I think this is fine as is, but maybe worth the other idea.
> --
> https://code.launchpad.net/~vishvananda/nova/lp767849/+merge/58597
> You are the owner of lp:~vishvananda/nova/lp767849.

Revision history for this message
Jay Pipes (jaypipes) wrote :

looking forward to the discussion on dicts vs. objects :) this lgtm for now.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.