diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-17 22:33:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-17 22:33:53 +0000 |
| commit | efc572efc1ac4ad4c595c772bf7daa1cd94e25eb (patch) | |
| tree | 78e6c4039d025d4a4ab60a00ab9d927ab18f73a8 | |
| parent | b40fa49809e8a7d2393429ff140f29b51925999e (diff) | |
| parent | deda02331474632c47b88c166241cd65b2952269 (diff) | |
| download | python-openstackclient-efc572efc1ac4ad4c595c772bf7daa1cd94e25eb.tar.gz | |
Merge "use jsonutils in oslo.serialization instead of keystoneclient"
| -rw-r--r-- | openstackclient/tests/common/test_clientmanager.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/openstackclient/tests/common/test_clientmanager.py b/openstackclient/tests/common/test_clientmanager.py index 18461fb7..9e9749c6 100644 --- a/openstackclient/tests/common/test_clientmanager.py +++ b/openstackclient/tests/common/test_clientmanager.py @@ -16,8 +16,8 @@ import mock from requests_mock.contrib import fixture from keystoneclient.auth.identity import v2 as auth_v2 -from keystoneclient.openstack.common import jsonutils from keystoneclient import service_catalog +from oslo.serialization import jsonutils from openstackclient.api import auth from openstackclient.common import clientmanager diff --git a/requirements.txt b/requirements.txt index 3fcde321..54ea7950 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ Babel>=1.3 cliff>=1.7.0 # Apache-2.0 oslo.i18n>=1.0.0 # Apache-2.0 oslo.utils>=1.0.0 # Apache-2.0 +oslo.serialization>=1.0.0 # Apache-2.0 python-glanceclient>=0.14.0 python-keystoneclient>=0.11.1 python-novaclient>=2.18.0 |