diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-15 18:42:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-15 18:42:17 +0000 |
| commit | c8cafc6e9df3a389330da08cbcbf60fb6ca1b238 (patch) | |
| tree | 830331d52e0a2ee9f3589ef43bfa7420eaf3d537 /nova/compute | |
| parent | 671c2c113be856f92bc415c5f0e23362dc0680eb (diff) | |
| parent | 6cb7801ac7d0f25dfbca0d8eb891feffdec695c5 (diff) | |
Merge "Alphabetize imports"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index b77336347..9f405a934 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -46,13 +46,13 @@ import traceback from eventlet import greenthread from nova import block_device -import nova.context from nova.compute import aggregate_states from nova.compute import instance_types from nova.compute import power_state from nova.compute import task_states from nova.compute import utils as compute_utils from nova.compute import vm_states +import nova.context from nova import exception from nova import flags import nova.image |