Merge "Remove nova.config.CONF"

This commit is contained in:
Jenkins
2012-11-20 02:02:50 +00:00
committed by Gerrit Code Review
64 changed files with 90 additions and 91 deletions

View File

@@ -57,13 +57,14 @@ import eventlet
from nova import config
from nova.db import base
from nova.openstack.common import cfg
from nova.openstack.common import log as logging
from nova.openstack.common.plugin import pluginmanager
from nova.openstack.common.rpc import dispatcher as rpc_dispatcher
from nova.scheduler import rpcapi as scheduler_rpcapi
from nova import version
CONF = config.CONF
CONF = cfg.CONF
LOG = logging.getLogger(__name__)