summaryrefslogtreecommitdiff
path: root/openstackclient/shell.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-14 12:37:01 +0000
committerGerrit Code Review <review@openstack.org>2016-06-14 12:37:01 +0000
commitb1bd427fcc277bb717d396841636fb10527c73bf (patch)
treedfc445861f195d155735d9e12bdbc4bc9b767ed4 /openstackclient/shell.py
parent5b36898b2b9777cb1d343834347429996d1bf984 (diff)
parenta55eb915a0d563ead7bd90ad91b9c86e98e87f7c (diff)
downloadpython-openstackclient-b1bd427fcc277bb717d396841636fb10527c73bf.tar.gz
Merge "osc-lib: timing"
Diffstat (limited to 'openstackclient/shell.py')
-rw-r--r--openstackclient/shell.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index 3e899cb5..a15e04dd 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -26,6 +26,7 @@ from cliff import app
from cliff import command
from cliff import complete
from cliff import help
+from osc_lib.command import timing
from osc_lib import exceptions as exc
from osc_lib import logs
from osc_lib import utils
@@ -35,7 +36,6 @@ from oslo_utils import strutils
import openstackclient
from openstackclient.common import clientmanager
from openstackclient.common import commandmanager
-from openstackclient.common import timing
from os_client_config import config as cloud_config