diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-02-16 13:49:54 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-02-16 13:49:54 -0600 |
| commit | d6c8fbe761a0c0558bb9c9635d7fdab8a99e3933 (patch) | |
| tree | fd030094eb5a120c94a95befab07befc69dc6dbc /nova/utils.py | |
| parent | 879845496a50477ebc2709291c159ae1e8d5aa2a (diff) | |
| parent | 61963f00ad70e73a06ffb35f3fd4b08696e39502 (diff) | |
| download | nova-d6c8fbe761a0c0558bb9c9635d7fdab8a99e3933.tar.gz nova-d6c8fbe761a0c0558bb9c9635d7fdab8a99e3933.tar.xz nova-d6c8fbe761a0c0558bb9c9635d7fdab8a99e3933.zip | |
Merge from 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 |