openstack
/
nova
Code Issues Proposed changes

Merge "Fix import order of openstack.common"

This commit is contained in:
Jenkins 2012-06-25 18:03:16 +00:00 committed by Gerrit Code Review
parent 2c7aa901b9 5685d20341
commit bf368360cb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-novncproxy
View File

@ -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 = [

2
nova/tests/compute/test_compute.py
View File

@ -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