OpenStack Compute (nova)

Merge lp://qastaging/~jk0/nova/lp835090 into lp://qastaging/~hudson-openstack/nova/trunk

  1. lp835090
  2. Merge into trunk
Proposed by Josh Kearney
Status: Merged
Approved by: Josh Kearney
Approved revision: 1534
Merged at revision: 1533
Proposed branch: lp://qastaging/~jk0/nova/lp835090
Merge into: lp://qastaging/~hudson-openstack/nova/trunk
Diff against target: 36 lines (+11/-4)
2 files modified
nova/tests/api/openstack/test_servers.py (+1/-1)
nova/virt/xenapi/vmops.py (+10/-3)
To merge this branch: bzr merge lp://qastaging/~jk0/nova/lp835090
Reviewer Review Type Date Requested Status
Matt Dietz (community) Approve
Trey Morris (community) Approve
Johannes Erdfelt (community) Approve
Review via email: mp+74648@code.qastaging.launchpad.net

Description of the change

Do not attempt to mount the swap VDI for file injection.

To post a comment you must log in.
Revision history for this message
Johannes Erdfelt (johannes.erdfelt) wrote :

LGTM

review: Approve
Revision history for this message
Trey Morris (tr3buchet) wrote :

lgmt

review: Approve
Revision history for this message
Matt Dietz (cerberus) wrote :

\o/

review: Approve
Revision history for this message
Trey Morris (tr3buchet) wrote :

which stands for "looks good man, thanks" just in case anyone has any remarks... ;)

Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

The attempt to merge lp:~jk0/nova/lp835090 into lp:nova failed. Below is the output from the failed tests.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.