diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-22 23:04:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-22 23:04:58 +0000 |
| commit | 5cb6f500d82dcd3a17e4b4ec78fcfc5f6a6e0327 (patch) | |
| tree | 2bbb5ad4c364ad5fef1443d50e03f282c0462606 /nova/openstack | |
| parent | 7a7782862f5e5a12c3959630dc251f9c3660b3c6 (diff) | |
| parent | 5ee22736ad37f5a479b5a23caa369b7b6e6f0482 (diff) | |
| download | nova-5cb6f500d82dcd3a17e4b4ec78fcfc5f6a6e0327.tar.gz nova-5cb6f500d82dcd3a17e4b4ec78fcfc5f6a6e0327.tar.xz nova-5cb6f500d82dcd3a17e4b4ec78fcfc5f6a6e0327.zip | |
Merge "Remove compat cfg wrapper"
Diffstat (limited to 'nova/openstack')
| -rw-r--r-- | nova/openstack/common/cfg.py | 17 | ||||
| -rw-r--r-- | nova/openstack/common/db/api.py | 3 |
2 files changed, 2 insertions, 18 deletions
diff --git a/nova/openstack/common/cfg.py b/nova/openstack/common/cfg.py deleted file mode 100644 index c35dcb845..000000000 --- a/nova/openstack/common/cfg.py +++ /dev/null @@ -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 * diff --git a/nova/openstack/common/db/api.py b/nova/openstack/common/db/api.py index edb42074f..90a200875 100644 --- a/nova/openstack/common/db/api.py +++ b/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 |