diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-13 00:35:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-13 00:35:49 +0000 |
| commit | 033097064958dc3686c81d7bf6de91238a4f05f5 (patch) | |
| tree | 25fbe2df9b6c7c5a829f21f59f996457bd1f9314 | |
| parent | 41a40dc80c3a9e133c9c8c919525ff2fd869e89d (diff) | |
| parent | 2454639a601f3fb88cc413c50501dfec3aca3a65 (diff) | |
| download | glance_store-033097064958dc3686c81d7bf6de91238a4f05f5.tar.gz | |
Merge "Use oslo_config.cfg.ConfigOpts in glance_store"
| -rw-r--r-- | glance_store/_drivers/swift/store.py | 2 | ||||
| -rw-r--r-- | glance_store/_drivers/swift/utils.py | 2 | ||||
| -rw-r--r-- | glance_store/backend.py | 2 | ||||
| -rw-r--r-- | glance_store/driver.py | 2 | ||||
| -rw-r--r-- | glance_store/location.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/glance_store/_drivers/swift/store.py b/glance_store/_drivers/swift/store.py index 472f515..68b47a4 100644 --- a/glance_store/_drivers/swift/store.py +++ b/glance_store/_drivers/swift/store.py @@ -20,7 +20,7 @@ import httplib import logging import math -from oslo.config import cfg +from oslo_config import cfg from oslo_utils import excutils from oslo_utils import units import six diff --git a/glance_store/_drivers/swift/utils.py b/glance_store/_drivers/swift/utils.py index 5565d5f..c27889e 100644 --- a/glance_store/_drivers/swift/utils.py +++ b/glance_store/_drivers/swift/utils.py @@ -20,7 +20,7 @@ try: except ImportError: from ordereddict import OrderedDict -from oslo.config import cfg +from oslo_config import cfg from glance_store import exceptions from glance_store import i18n diff --git a/glance_store/backend.py b/glance_store/backend.py index 735e603..66f7de7 100644 --- a/glance_store/backend.py +++ b/glance_store/backend.py @@ -15,7 +15,7 @@ import logging -from oslo.config import cfg +from oslo_config import cfg from stevedore import driver from stevedore import extension diff --git a/glance_store/driver.py b/glance_store/driver.py index d4cba8f..c95fdf2 100644 --- a/glance_store/driver.py +++ b/glance_store/driver.py @@ -18,7 +18,7 @@ import logging -from oslo.config import cfg +from oslo_config import cfg from oslo_utils import importutils from oslo_utils import units diff --git a/glance_store/location.py b/glance_store/location.py index a98773d..b60c485 100644 --- a/glance_store/location.py +++ b/glance_store/location.py @@ -40,7 +40,7 @@ credentials and is **not** user-facing. import logging import urlparse -from oslo.config import cfg +from oslo_config import cfg from glance_store import exceptions |