Merge "Fix 'keypair show' command output"

This commit is contained in:
Jenkins 2014-03-10 16:40:50 +00:00 committed by Gerrit Code Review
commit cf8506d2bd

@ -146,7 +146,7 @@ class ShowKeypair(show.ShowOne):
parsed_args.name)
info = {}
info.update(keypair._info['keypair'])
info.update(keypair._info)
if not parsed_args.public_key:
del info['public_key']
return zip(*sorted(six.iteritems(info)))