summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2017-09-14 11:06:51 -0500
committerDean Troyer <dtroyer@gmail.com>2017-09-14 11:16:11 -0500
commit5309bf5f873aba4e994c9011a893987c40d56eda (patch)
tree9e1bf90f6bb27cc6e0a5f9b4ef81ef8431d21599 /openstackclient/common
parent5e5239d5eb635470b0c3bc63c4a6263808c41c9b (diff)
parentf63bb180036c0f2d096eefaaaf2fbdd60a427343 (diff)
downloadpython-openstackclient-5309bf5f873aba4e994c9011a893987c40d56eda.tar.gz
Merge remote-tracking branch 'origin/master' into f4-merge-branch
Change-Id: Ie6c321e67aa9338334e4649879e60847a5d1eb56
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/clientmanager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 67912f0c..ea581696 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -16,11 +16,11 @@
"""Manage access to the clients, including authenticating when needed."""
import logging
-import pkg_resources
import sys
from osc_lib import clientmanager
from osc_lib import shell
+import pkg_resources
LOG = logging.getLogger(__name__)