summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-01 16:15:25 +0000
committerGerrit Code Review <review@openstack.org>2016-12-01 16:15:25 +0000
commit0c2d99e2ac99e2c7a341ae20902b4a7683c30ea7 (patch)
treeb8caa8ae867c2344728cff4e5b79c0c02649a790
parentfae461072b477d309fff9567518142acb8fa9132 (diff)
parentac2a769b1f89a31eb7af28470038aa3b39c12358 (diff)
downloadpython-novaclient-0c2d99e2ac99e2c7a341ae20902b4a7683c30ea7.tar.gz
Merge "Correct copy/paste errors in help" into stable/newton
-rw-r--r--novaclient/v2/shell.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py
index d94155f8..36f0080c 100644
--- a/novaclient/v2/shell.py
+++ b/novaclient/v2/shell.py
@@ -858,10 +858,9 @@ def _print_flavor_list(flavors, show_extra_specs=False):
metavar='<limit>',
type=int,
default=None,
- help=_("Maximum number of flavors to display. If limit == -1, all flavors "
- "will be displayed. If limit is bigger than 'osapi_max_limit' "
- "option of Nova API, limit 'osapi_max_limit' will be used "
- "instead."))
+ help=_("Maximum number of flavors to display. If limit is bigger than "
+ "'osapi_max_limit' option of Nova API, limit 'osapi_max_limit' "
+ "will be used instead."))
def do_flavor_list(cs, args):
"""Print a list of available 'flavors' (sizes of servers)."""
if args.all:
@@ -3316,8 +3315,7 @@ def do_keypair_list(cs, args):
metavar='<limit>',
type=int,
default=None,
- help=_("Maximum number of keypairs to display. If limit == -1, all "
- "keypairs will be displayed. If limit is bigger than "
+ help=_("Maximum number of keypairs to display. If limit is bigger than "
"'osapi_max_limit' option of Nova API, limit 'osapi_max_limit' "
"will be used instead."))
def do_keypair_list(cs, args):
@@ -4221,8 +4219,7 @@ def do_hypervisor_list(cs, args):
metavar='<limit>',
type=int,
default=None,
- help=_("Maximum number of hypervisors to display. If limit == -1, all "
- "hypervisors will be displayed. If limit is bigger than "
+ help=_("Maximum number of hypervisors to display. If limit is bigger than "
"'osapi_max_limit' option of Nova API, limit 'osapi_max_limit' "
"will be used instead."))
def do_hypervisor_list(cs, args):