diff --git a/.mailmap b/.mailmap index f270bb6f5..a29c779e0 100644 --- a/.mailmap +++ b/.mailmap @@ -3,6 +3,7 @@ Antony Messerli <amesserl@rackspace.com> root <root@debian.ohthree.com> <brian.waldon@rackspace.com> <bcwaldon@gmail.com> Chris Behrens <cbehrens+github@codestud.com> comstud <cbehrens+github@codestud.com> <cbehrens+github@codestud.com> <cbehrens@codestud.com> +<dprince@redhat.com> <dan.prince@rackspace.com> Johannes Erdfelt <johannes.erdfelt@rackspace.com> jerdfelt <johannes@erdfelt.com> <johannes.erdfelt@rackspace.com> <johannes@erdfelt.com> <josh@jk0.org> <jkearney@nova.(none)> diff --git a/AUTHORS b/AUTHORS index df7ab19fc..a79c56d0a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,7 +11,7 @@ Chmouel Boudjnah <chmouel.boudjnah@rackspace.co.uk> Chris Behrens <cbehrens+github@codestud.com> Christopher MacGown <ignoti+github@gmail.com> Cole Robinson <crobinso@redhat.com> -Dan Prince <dan.prince@rackspace.com> +Dan Prince <dprince@redhat.com> Dan Wendlandt <dan@nicira.com> Dave Walker <Dave.Walker@canonical.com> Dean Troyer <dtroyer@gmail.com> diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py index 94e25c144..e7e110663 100644 --- a/novaclient/v1_1/shell.py +++ b/novaclient/v1_1/shell.py @@ -1258,7 +1258,7 @@ def do_secgroup_delete(cs, args): def do_secgroup_list(cs, args): - """List security groups for the curent tenant.""" + """List security groups for the current tenant.""" _print_secgroups(cs.security_groups.list())