OpenStack Compute (nova)

Merge lp:~vishvananda/nova/import-greenthread into lp:~hudson-openstack/nova/trunk

  1. import-greenthread
  2. Merge into trunk
Proposed by Vish Ishaya
Status: Merged
Approved by: Rick Clark
Approved revision: 842
Merged at revision: 848
Proposed branch: lp:~vishvananda/nova/import-greenthread
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 15 lines (+1/-2)
1 file modified
nova/virt/libvirt_conn.py (+1/-2)
To merge this branch: bzr merge lp:~vishvananda/nova/import-greenthread
Reviewer Review Type Date Requested Status
Rick Clark (community) Approve
Josh Kearney (community) Approve
Review via email: mp+54275@code.launchpad.net

Description of the change

Correctly imports greenthread in libvirt_conn.py. It is used by live_migrate().

To post a comment you must log in.
Revision history for this message
Josh Kearney (jk0) wrote :

lgtm

review: Approve
Revision history for this message
Rick Clark (dendrobates) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/libvirt_conn.py'
2--- nova/virt/libvirt_conn.py 2011-03-17 21:23:35 +0000
3+++ nova/virt/libvirt_conn.py 2011-03-21 21:23:25 +0000
4@@ -46,10 +46,9 @@
5 import uuid
6 from xml.dom import minidom
7
8-
9+from eventlet import greenthread
10 from eventlet import tpool
11 from eventlet import semaphore
12-
13 import IPy
14
15 from nova import context