Merge "remove start_version arg for keypairs v2.10 shell"

This commit is contained in:
Jenkins
2016-08-05 00:28:14 +00:00
committed by Gerrit Code Review

View File

@@ -3095,8 +3095,7 @@ def do_keypair_delete(cs, args):
'--user',
metavar='<user-id>',
default=None,
help=_('ID of key-pair owner (Admin only).'),
start_version="2.10")
help=_('ID of key-pair owner (Admin only).'))
def do_keypair_delete(cs, args):
"""Delete keypair given by its name."""
cs.keypairs.delete(args.name, args.user)
@@ -3125,8 +3124,7 @@ def do_keypair_list(cs, args):
'--user',
metavar='<user-id>',
default=None,
help=_('List key-pairs of specified user ID (Admin only).'),
start_version="2.10")
help=_('List key-pairs of specified user ID (Admin only).'))
def do_keypair_list(cs, args):
"""Print a list of keypairs for a user"""
keypairs = cs.keypairs.list(args.user)
@@ -3161,8 +3159,7 @@ def do_keypair_show(cs, args):
'--user',
metavar='<user-id>',
default=None,
help=_('ID of key-pair owner (Admin only).'),
start_version="2.10")
help=_('ID of key-pair owner (Admin only).'))
def do_keypair_show(cs, args):
"""Show details about the given keypair."""
keypair = cs.keypairs.get(args.keypair, args.user)