Merge lp:~rackspace-titan/nova/build-failure-lp833856-d4 into lp:~hudson-openstack/nova/milestone-proposed

Proposed by Brian Waldon on 2011-08-25
Status: Merged
Approved by: Vish Ishaya on 2011-08-25
Approved revision: 1152
Merged at revision: 1152
Proposed branch: lp:~rackspace-titan/nova/build-failure-lp833856-d4
Merge into: lp:~hudson-openstack/nova/milestone-proposed
Diff against target: 14 lines (+2/-3)
1 file modified
nova/virt/xenapi/vmops.py (+2/-3)
To merge this branch: bzr merge lp:~rackspace-titan/nova/build-failure-lp833856-d4
Reviewer Review Type Date Requested Status
OpenStack release team 2011-08-25 Pending
Review via email: mp+72923@code.launchpad.net

Commit message

porting fix for rebuild failure bug lp:833856

To post a comment you must log in.
Vish Ishaya (vishvananda) wrote :

Ha, thx soren. Didn't notice it was missing a commit message.

Brian Waldon (bcwaldon) wrote :

> Ha, thx soren. Didn't notice it was missing a commit message.

Doesn't the description act as a commit message?

Brian Waldon (bcwaldon) wrote :

Oh. I see. My bad.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/xenapi/vmops.py'
2--- nova/virt/xenapi/vmops.py 2011-08-23 04:17:57 +0000
3+++ nova/virt/xenapi/vmops.py 2011-08-25 16:33:34 +0000
4@@ -239,9 +239,8 @@
5 self._attach_disks(instance, disk_image_type, vm_ref, first_vdi_ref,
6 vdis)
7
8- # Alter the image before VM start for, e.g. network injection also
9- # alter the image if there's metadata.
10- if FLAGS.flat_injected or instance['metadata']:
11+ # Alter the image before VM start for network injection.
12+ if FLAGS.flat_injected:
13 VMHelper.preconfigure_instance(self._session, instance,
14 first_vdi_ref, network_info)
15

Subscribers

People subscribed via source and target branches