diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-14 04:22:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-14 04:22:03 +0000 |
| commit | 287fe3610af6297b654dc30ee587aa0f7eecaeaa (patch) | |
| tree | 6b91a34be273f921f59e8032ae8bb2ca546c8d20 /openstackclient/compute | |
| parent | 5c402c1da23cde8b566e406b4e56bd2be2e1a729 (diff) | |
| parent | be192676bd2f2beeea0ec4265d5f78a8cf9af637 (diff) | |
| download | python-openstackclient-287fe3610af6297b654dc30ee587aa0f7eecaeaa.tar.gz | |
Merge "osc-lib: parseractions"
Diffstat (limited to 'openstackclient/compute')
| -rw-r--r-- | openstackclient/compute/v2/aggregate.py | 2 | ||||
| -rw-r--r-- | openstackclient/compute/v2/console.py | 2 | ||||
| -rw-r--r-- | openstackclient/compute/v2/flavor.py | 2 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/openstackclient/compute/v2/aggregate.py b/openstackclient/compute/v2/aggregate.py index 69227b0c..9e44615d 100644 --- a/openstackclient/compute/v2/aggregate.py +++ b/openstackclient/compute/v2/aggregate.py @@ -16,11 +16,11 @@ """Compute v2 Aggregate action implementations""" +from osc_lib.cli import parseractions from osc_lib import utils import six from openstackclient.common import command -from openstackclient.common import parseractions from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py index ee168016..ff7f1af6 100644 --- a/openstackclient/compute/v2/console.py +++ b/openstackclient/compute/v2/console.py @@ -17,11 +17,11 @@ import sys +from osc_lib.cli import parseractions from osc_lib import utils import six from openstackclient.common import command -from openstackclient.common import parseractions from openstackclient.i18n import _ diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py index 7cca37e5..439818eb 100644 --- a/openstackclient/compute/v2/flavor.py +++ b/openstackclient/compute/v2/flavor.py @@ -15,12 +15,12 @@ """Flavor action implementations""" +from osc_lib.cli import parseractions from osc_lib import exceptions from osc_lib import utils import six from openstackclient.common import command -from openstackclient.common import parseractions from openstackclient.i18n import _ from openstackclient.identity import common as identity_common 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 |