summaryrefslogtreecommitdiff
path: root/openstackclient/compute/v2/server.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-14 04:22:03 +0000
committerGerrit Code Review <review@openstack.org>2016-06-14 04:22:03 +0000
commit287fe3610af6297b654dc30ee587aa0f7eecaeaa (patch)
tree6b91a34be273f921f59e8032ae8bb2ca546c8d20 /openstackclient/compute/v2/server.py
parent5c402c1da23cde8b566e406b4e56bd2be2e1a729 (diff)
parentbe192676bd2f2beeea0ec4265d5f78a8cf9af637 (diff)
downloadpython-openstackclient-287fe3610af6297b654dc30ee587aa0f7eecaeaa.tar.gz
Merge "osc-lib: parseractions"
Diffstat (limited to 'openstackclient/compute/v2/server.py')
-rw-r--r--openstackclient/compute/v2/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 7e810898..99429c5a 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -21,6 +21,7 @@ import io
import os
import sys
+from osc_lib.cli import parseractions
from osc_lib import exceptions
from osc_lib import utils
import six
@@ -31,7 +32,6 @@ except ImportError:
from novaclient.v1_1 import servers
from openstackclient.common import command
-from openstackclient.common import parseractions
from openstackclient.i18n import _
from openstackclient.identity import common as identity_common