diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-03 15:16:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-03 15:16:12 +0000 |
| commit | 662dd76e1c3195625eba8c879f2764c625341327 (patch) | |
| tree | 5b5df6d659a04a3d50bf5616b4974e1ddcecba29 | |
| parent | 94ad18b31fd23c3e3ccc268c80fef52f4600426a (diff) | |
| parent | df444d6531176e5928f92b95569071d4ec27c8cc (diff) | |
| download | glance_store-662dd76e1c3195625eba8c879f2764c625341327.tar.gz | |
Merge "Rename oslo.concurrency to oslo_concurrency"
| -rw-r--r-- | glance_store/_drivers/sheepdog.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tests/unit/test_sheepdog_store.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/glance_store/_drivers/sheepdog.py b/glance_store/_drivers/sheepdog.py index b62483f..2b772db 100644 --- a/glance_store/_drivers/sheepdog.py +++ b/glance_store/_drivers/sheepdog.py @@ -18,7 +18,7 @@ import hashlib import logging -from oslo.concurrency import processutils +from oslo_concurrency import processutils from oslo_config import cfg from oslo_utils import excutils from oslo_utils import units diff --git a/requirements.txt b/requirements.txt index ed99480..c8cb91c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ oslo.config>=1.6.0 # Apache-2.0 oslo.i18n>=0.1.0 oslo.serialization>=1.0.0 # Apache-2.0 oslo.utils>=1.2.0 # Apache-2.0 -oslo.concurrency>=0.1.0 # Apache-2.0 +oslo.concurrency>=1.4.1 # Apache-2.0 stevedore>=0.12 python-cinderclient>=1.0.6 diff --git a/tests/unit/test_sheepdog_store.py b/tests/unit/test_sheepdog_store.py index 91307cd..04ac568 100644 --- a/tests/unit/test_sheepdog_store.py +++ b/tests/unit/test_sheepdog_store.py @@ -16,7 +16,7 @@ import StringIO import mock -from oslo.concurrency import processutils +from oslo_concurrency import processutils from glance_store._drivers import sheepdog from glance_store.tests import base |