Merge lp:~vishvananda/nova/fix-state-description into lp:~hudson-openstack/nova/trunk
Proposed by
Vish Ishaya
Status: | Merged |
---|---|
Approved by: | Devin Carlen |
Approved revision: | 1522 |
Merged at revision: | 1522 |
Proposed branch: | lp:~vishvananda/nova/fix-state-description |
Merge into: | lp:~hudson-openstack/nova/trunk |
Diff against target: |
107 lines (+12/-11) 4 files modified
bin/nova-manage (+3/-3) nova/api/ec2/admin.py (+2/-3) nova/api/openstack/contrib/simple_tenant_usage.py (+1/-1) nova/tests/test_libvirt.py (+6/-4) |
To merge this branch: | bzr merge lp:~vishvananda/nova/fix-state-description |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Devin Carlen (community) | Approve | ||
Brian Waldon (community) | Approve | ||
Alex Meade (community) | Approve | ||
Brian Lamar (community) | Approve | ||
Review via email: mp+73715@code.launchpad.net |
Description of the change
Fix a few references to state_description that slipped through.
To post a comment you must log in.
Arg! Sorry about this Vish. ack-grep the tool I used to search for state and state_description evidently doesn't search non-.py files and the ec2/admin.py changes must have slipped in between the time I merge propped and getting it accepted.
Thanks for cleaning this up.