diff options
| author | Andy Southgate <andy.southgate@citrix.com> | 2011-02-16 19:20:51 +0000 |
|---|---|---|
| committer | Andy Southgate <andy.southgate@citrix.com> | 2011-02-16 19:20:51 +0000 |
| commit | c1603c9d3ccf2cb0db8541f32380bd53f228d6ec (patch) | |
| tree | 4f2e05f43dd8cb30a770d56f55f52ff9a828b387 /nova/utils.py | |
| parent | 2dfcfccd74821851c965ee2912fd315e25e7f838 (diff) | |
| parent | 61963f00ad70e73a06ffb35f3fd4b08696e39502 (diff) | |
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 |