Merge "use jsonutils in oslo.serialization instead of keystoneclient"

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

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