summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap4
-rw-r--r--Authors9
2 files changed, 11 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index cf79dc95c..ab4906067 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,3 +22,7 @@
<todd@ansolabs.com> <todd@rubidine.com>
<vishvananda@gmail.com> <vishvananda@yahoo.com>
<vishvananda@gmail.com> <root@mirror.nasanebula.net>
+# These are from people who failed to set a proper committer
+. <root@tonbuntu>
+. <laner@controller>
+. <root@ubuntu>
diff --git a/Authors b/Authors
index 87ebb55d7..ef1a535ca 100644
--- a/Authors
+++ b/Authors
@@ -1,6 +1,9 @@
Andy Smith <code@term.ie>
Anne Gentle <anne@openstack.org>
+Anthony Young <sleepsonthefloor@gmail.com>
+Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Chris Behrens <cbehrens@codestud.com>
+Dean Troyer <dtroyer@gmail.com>
Devin Carlen <devin.carlen@gmail.com>
Eric Day <eday@oddments.org>
Ewan Mellor <ewan.mellor@citrix.com>
@@ -8,7 +11,8 @@ Hisaki Ohara <hisaki.ohara@intel.com>
Jay Pipes <jaypipes@gmail.com>
Jesse Andrews <anotherjesse@gmail.com>
Joe Heck <heckj@mac.com>
-Joel Moore joelbm24@gmail.com
+Joel Moore <joelbm24@gmail.com>
+Josh Kearney <josh.kearney@rackspace.com>
Joshua McKenty <jmckenty@gmail.com>
Justin Santa Barbara <justin@fathomdb.com>
Matt Dietz <matt.dietz@rackspace.com>
@@ -19,4 +23,5 @@ Rick Clark <rick@openstack.org>
Soren Hansen <soren.hansen@rackspace.com>
Todd Willey <todd@ansolabs.com>
Vishvananda Ishaya <vishvananda@gmail.com>
-¿¿¿??? <sleepsonthefloor@gmail.com>
+Youcef Laribi <Youcef.Laribi@eu.citrix.com>
+Zhixue Wu <Zhixue.Wu@citrix.com>