Merge "Remove compat cfg wrapper"

nova/openstack/common/cfg.py

@@ -1,17 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2013 Red Hat, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo.config.cfg import *

nova/openstack/common/db/api.py

@@ -37,7 +37,8 @@ https://bitbucket.org/eventlet/eventlet/issue/137/
 """
 import functools
 
-from nova.openstack.common import cfg
+from oslo.config import cfg
+
 from nova.openstack.common import lockutils
 from nova.openstack.common import importutils