summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/nova-novncproxy2
-rw-r--r--nova/tests/compute/test_compute.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy
index 228db0d2f..30a13612e 100755
--- a/bin/nova-novncproxy
+++ b/bin/nova-novncproxy
@@ -31,9 +31,9 @@ import websockify
from nova import context
from nova import flags
from nova import log as logging
+from nova.openstack.common import cfg
from nova import rpc
from nova import utils
-from nova.openstack.common import cfg
opts = [
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 0a90a754c..439f3bd49 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -44,9 +44,9 @@ from nova import log as logging
from nova.notifier import test_notifier
from nova.openstack.common import importutils
from nova.openstack.common import policy as common_policy
-from nova.openstack.common import timeutils
from nova.openstack.common import rpc
from nova.openstack.common.rpc import common as rpc_common
+from nova.openstack.common import timeutils
import nova.policy
from nova import quota
from nova.scheduler import driver as scheduler_driver