diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-07 19:49:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-07 19:49:06 +0000 |
| commit | 2adeac2bc2421a96273dfbc2b39a43cc06e542e6 (patch) | |
| tree | 0233a50e26171805134ad436700fd3b160771ef8 /openstackclient/common | |
| parent | bca1851911af8d1ec499104bcbbf6ff1e41389cb (diff) | |
| parent | d324530532d5361e85e784c3df2f0d40a128b149 (diff) | |
| download | python-openstackclient-2adeac2bc2421a96273dfbc2b39a43cc06e542e6.tar.gz | |
Merge "osc-lib: api.auth"
Diffstat (limited to 'openstackclient/common')
| -rw-r--r-- | openstackclient/common/clientmanager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py index 3c35b529..13c6b92c 100644 --- a/openstackclient/common/clientmanager.py +++ b/openstackclient/common/clientmanager.py @@ -20,12 +20,12 @@ import logging import pkg_resources import sys +from osc_lib.api import auth from osc_lib import exceptions from oslo_utils import strutils import requests import six -from openstackclient.api import auth from openstackclient.common import session as osc_session from openstackclient.identity import client as identity_client |