diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-02-16 19:09:40 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-02-16 19:09:40 +0100 |
| commit | 775fc13f8ea85bb74f8f55dedc02f44cb5aac2b9 (patch) | |
| tree | 66b6289cb1e5a418384b7ed1d973cf6c5a4f984f /nova/utils.py | |
| parent | ef7e1003a2f7f0743808236e7e10d2a2b4369de6 (diff) | |
| parent | 17abf5c23f90f15b557131f71657e70e7b5cdef8 (diff) | |
| download | nova-775fc13f8ea85bb74f8f55dedc02f44cb5aac2b9.tar.gz nova-775fc13f8ea85bb74f8f55dedc02f44cb5aac2b9.tar.xz nova-775fc13f8ea85bb74f8f55dedc02f44cb5aac2b9.zip | |
Merge trunk
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py index 8d7ff1f64..ba71ebf39 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -25,7 +25,6 @@ import inspect import json import os import random -import subprocess import socket import struct import sys @@ -36,6 +35,7 @@ import netaddr from eventlet import event from eventlet import greenthread +from eventlet.green import subprocess from nova import exception from nova.exception import ProcessExecutionError |