lp:~jk0/nova/xs-rescue

Branch merges

Propose for merging

No branches dependent on this one.

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

Rick Harris (community): Approve on 2011-03-02

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

Diff: 641 lines (+220/-62)

13 files modified

.mailmap (+1/-0)
Authors (+1/-1)
nova/api/openstack/__init__.py (+2/-0)
nova/api/openstack/servers.py (+22/-0)
nova/compute/manager.py (+24/-10)
nova/db/sqlalchemy/models.py (+6/-1)
nova/tests/xenapi/stubs.py (+1/-1)
nova/virt/libvirt_conn.py (+2/-2)
nova/virt/xenapi/fake.py (+1/-1)
nova/virt/xenapi/vm_utils.py (+10/-12)
nova/virt/xenapi/vmops.py (+132/-27)
nova/virt/xenapi/volumeops.py (+1/-1)
nova/virt/xenapi_conn.py (+17/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

603. By Josh Kearney on 2011-03-02

Updated docstrings

602. By Josh Kearney on 2011-03-01

Review feedback

601. By Josh Kearney on 2011-03-01

Fixed trunk merge issues

600. By Josh Kearney on 2011-03-01

Merged trunk

599. By Josh Kearney on 2011-02-25

Bootlock original instance during rescue

598. By Josh Kearney on 2011-02-25

Removed unnecessary compute import

597. By Josh Kearney on 2011-02-25

Set rescue instance VIF device

596. By Josh Kearney on 2011-02-25

Teardown rescue instance

595. By Josh Kearney on 2011-02-25

Merged trunk

594. By Josh Kearney on 2011-02-25

Create rescue instance