Merge lp:~vishvananda/nova/lp829020 into lp:~hudson-openstack/nova/trunk
Proposed by
Vish Ishaya
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Dan Prince | ||||
Approved revision: | 1545 | ||||
Merged at revision: | 1581 | ||||
Proposed branch: | lp:~vishvananda/nova/lp829020 | ||||
Merge into: | lp:~hudson-openstack/nova/trunk | ||||
Diff against target: |
132 lines (+40/-37) 1 file modified
nova/virt/libvirt/connection.py (+40/-37) |
||||
To merge this branch: | bzr merge lp:~vishvananda/nova/lp829020 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dan Prince (community) | Approve | ||
Devin Carlen (community) | Approve | ||
Review via email: mp+75433@code.launchpad.net |
Description of the change
Fixes libvirt rescue to use the same strategy as xen. Use a new copy of the base image as the rescue image. It leaves the original rescue image flags in, so a hand picked rescue image can still be used if desired.
To post a comment you must log in.
You've got a merge conflict that needs to be resolved.