summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-08-08 16:06:31 -0500
committerJosh Kearney <josh@jk0.org>2011-08-08 16:07:33 -0500
commitc8b3b13615d4b3874c792549a8467e88575138b9 (patch)
treebe627a339f02b729c1e3858126a2fa19e9da6092
parent360ee0a34b37edd71525708127f5bed6e43f5e9b (diff)
downloadpython-novaclient-c8b3b13615d4b3874c792549a8467e88575138b9.tar.gz
Added .mailmap file for AUTHORS.
-rw-r--r--.mailmap10
-rw-r--r--AUTHORS11
-rwxr-xr-x[-rw-r--r--]tools/generate_authors.sh0
3 files changed, 13 insertions, 8 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..53f67d13
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,10 @@
+Antony Messerli <amesserl@rackspace.com> root <root@debian.ohthree.com>
+<amesserl@rackspace.com> <root@debian.ohthree.com>
+Chris Behrens <cbehrens+github@codestud.com> comstud <cbehrens+github@codestud.com>
+<cbehrens+github@codestud.com> <cbehrens@codestud.com>
+Johannes Erdfelt <johannes.erdfelt@rackspace.com> jerdfelt <johannes@erdfelt.com>
+<johannes.erdfelt@rackspace.com> <johannes@erdfelt.com>
+<josh@jk0.org> <jkearney@nova.(none)>
+<sandy@darksecretsoftware.com> <sandy.walsh@rackspace.com>
+<sandy@darksecretsoftware.com> <sandy@sandywalsh.com>
+Andy Smith <github@anarkystic.com> termie <github@anarkystic.com>
diff --git a/AUTHORS b/AUTHORS
index 9e2b7121..056b526f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,22 +1,17 @@
Andrey Brindeyev <abrindeyev@griddynamics.com>
+Andy Smith <github@anarkystic.com>
Antony Messerli <amesserl@rackspace.com>
Brian Lamar <brian.lamar@rackspace.com>
Brian Waldon <brian.waldon@rackspace.com>
-Chris Behrens <cbehrens@codestud.com>
+Chris Behrens <cbehrens+github@codestud.com>
Christopher MacGown <ignoti+github@gmail.com>
Ed Leafe <ed@leafe.com>
Eldar Nugaev <eldr@ya.ru>
Ilya Alekseyev <ilyaalekseyev@acm.org>
Johannes Erdfelt <johannes.erdfelt@rackspace.com>
-Josh Kearney <jkearney@nova.(none)>
Josh Kearney <josh@jk0.org>
Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Kirill Shileev <kshileev@griddynamics.com>
Lvov Maxim <mlvov@mirantis.com>
Matt Dietz <matt.dietz@rackspace.com>
-Sandy Walsh <sandy.walsh@rackspace.com>
-Sandy Walsh <sandy@sandywalsh.com>
-comstud <cbehrens+github@codestud.com>
-jerdfelt <johannes@erdfelt.com>
-root <root@debian.ohthree.com>
-termie <github@anarkystic.com>
+Sandy Walsh <sandy@darksecretsoftware.com>
diff --git a/tools/generate_authors.sh b/tools/generate_authors.sh
index c41f0798..c41f0798 100644..100755
--- a/tools/generate_authors.sh
+++ b/tools/generate_authors.sh