diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-17 20:47:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-17 20:47:55 +0000 |
| commit | cb681706fa5da9bf7ab4ebf9c4500896b2f90ca0 (patch) | |
| tree | c476aaa5591f14f50a9392224a88be0de4af7b66 /openstackclient/common/clientmanager.py | |
| parent | 6c4f81516c6ad119d39c4952f3ab274f3d3f2efa (diff) | |
| parent | 0d689871b4d8c060e1d48a9472449f3d670333bb (diff) | |
| download | python-openstackclient-cb681706fa5da9bf7ab4ebf9c4500896b2f90ca0.tar.gz | |
Merge "Fix session timing"
Diffstat (limited to 'openstackclient/common/clientmanager.py')
| -rw-r--r-- | openstackclient/common/clientmanager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py index 10f38c25..6d2a9d76 100644 --- a/openstackclient/common/clientmanager.py +++ b/openstackclient/common/clientmanager.py @@ -19,10 +19,10 @@ import logging import pkg_resources import sys -from keystoneclient import session import requests from openstackclient.api import auth +from openstackclient.common import session as osc_session from openstackclient.identity import client as identity_client @@ -157,7 +157,7 @@ class ClientManager(object): self.auth = auth_plugin.load_from_options(**self._auth_params) # needed by SAML authentication request_session = requests.session() - self.session = session.Session( + self.session = osc_session.TimingSession( auth=self.auth, session=request_session, verify=self._verify, |
