lp:~rackspace-titan/nova/rebuild-server-lp730233

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 1051

Jay Pipes (community): Approve on 2011-05-03

Matt Dietz (community): Approve on 2011-05-02

Cory Wright (community): Approve on 2011-04-07

Diff: 599 lines (+359/-60)

9 files modified

nova/api/openstack/servers.py (+79/-4)
nova/api/openstack/views/servers.py (+3/-1)
nova/compute/api.py (+28/-0)
nova/compute/manager.py (+60/-27)
nova/compute/power_state.py (+12/-9)
nova/exception.py (+5/-1)
nova/tests/api/openstack/test_servers.py (+169/-9)
nova/tests/test_exception.py (+2/-2)
nova/virt/xenapi/vmops.py (+1/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #73023: Round orange emblems have lack usability	Medium	Won't Fix
Bug #730233: Openstack API 1.1 Actions	Medium	Fix Released

Link a bug report

Related blueprints

959. By Brian Waldon on 2011-05-03

adding debug log message

958. By Brian Waldon on 2011-05-03

merging trunk

957. By Brian Waldon on 2011-05-02

merging trunk; resolving conflicts; fixing issue with ApiError test failing since r1043

956. By Brian Waldon on 2011-05-02

merging trunk; resolving conflicts

955. By Brian Lamar on 2011-04-21

Merged trunk and fixed api servers conflict.

954. By Brian Lamar on 2011-04-21

Fixes and reworkings based on review.

953. By Brian Lamar on 2011-04-20

Reverted bad merge.

952. By Brian Lamar on 2011-04-20

Removed no longer relevant comment.

951. By Brian Lamar on 2011-04-20

Removed TODO we don't need.

950. By Brian Lamar on 2011-04-20

Removed _ and replaced with real variable name.