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 |
Related bugs: |
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.
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.