Merge lp://qastaging/~jk0/nova/lp833205 into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
Josh Kearney
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Josh Kearney | ||||
| Approved revision: | 1536 | ||||
| Merged at revision: | 1547 | ||||
| Proposed branch: | lp://qastaging/~jk0/nova/lp833205 | ||||
| Merge into: | lp://qastaging/~hudson-openstack/nova/trunk | ||||
| Diff against target: |
213 lines (+39/-22) 12 files modified
nova/api/openstack/servers.py (+2/-3) nova/compute/api.py (+3/-2) nova/compute/manager.py (+2/-2) nova/tests/test_compute.py (+14/-5) nova/tests/test_virt_drivers.py (+2/-1) nova/tests/test_vmwareapi.py (+2/-1) nova/virt/driver.py (+2/-1) nova/virt/fake.py (+1/-1) nova/virt/hyperv.py (+1/-1) nova/virt/vmwareapi_conn.py (+1/-1) nova/virt/xenapi/vmops.py (+7/-2) nova/virt/xenapi_conn.py (+2/-2) |
||||
| To merge this branch: | bzr merge lp://qastaging/~jk0/nova/lp833205 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Devin Carlen (community) | Approve | ||
| Brian Waldon (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Pass reboot_type (either HARD or SOFT) to the virt layers from the API.
This only works with XenAPI at the moment. The other hypervisors will need to be implemented as their maintainers see fit.
To post a comment you must log in.
Revision history for this message
| OpenStack Infra (hudson-openstack) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Awesome.