diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-02-15 15:27:59 -0600 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-02-15 15:27:59 -0600 |
| commit | 92c02908b3e33806e706ba9c59ca35398b645345 (patch) | |
| tree | 5290ba271d6fdc8377ca4b6713b4026bc7688610 /nova/utils.py | |
| parent | 503749849df73df1732583bc9452e7952bf78ac2 (diff) | |
| parent | 273e6703a9e4f7e3b7810f204ffb6bb0f86602bd (diff) | |
| download | nova-92c02908b3e33806e706ba9c59ca35398b645345.tar.gz nova-92c02908b3e33806e706ba9c59ca35398b645345.tar.xz nova-92c02908b3e33806e706ba9c59ca35398b645345.zip | |
merge with 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 |