summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2018-05-24 22:48:15 -0700
committerJohn Dickinson <me@not.mn>2018-05-29 16:36:47 -0700
commitfbb3b1ffdaf7d01744753369d48db6931e8c4dd4 (patch)
tree8a155ea3267a2dfc2d0e0d78b7c3d1cb7123c4b3 /.mailmap
parent4518d95b6f0e21a9a265fafaa411737edcfc1103 (diff)
downloadswift-fbb3b1ffdaf7d01744753369d48db6931e8c4dd4.tar.gz
authors/changelog update for 2.18.0 release
Change-Id: Ia1b78aa40b1f157b513428cef59e69077b2aaee7
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 26dc285c6..046a19d8f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,6 +43,7 @@ David Hadas <davidh@il.ibm.com> <david.hadas@gmail.com>
Yaguang Wang <yaguang.wang@intel.com> ywang19 <yaguang.wang@intel.com>
Liu Siqi <meizu647@gmail.com> dk647 <meizu647@gmail.com>
James E. Blair <jeblair@openstack.org> <james.blair@rackspace.com>
+James E. Blair <jeblair@openstack.org> <jeblair@redhat.com>
Kun Huang <gareth@unitedstack.com> <academicgareth@gmail.com>
Michael Shuler <mshuler@gmail.com> <mshuler@rackspace.com>
Ilya Kharin <ikharin@mirantis.com> <akscram@gmail.com>
@@ -122,3 +123,5 @@ Tin Lam <tinlam@gmail.com> <tl3438@att.com>
Hisashi Osanai <osanai.hisashi@gmail.com> <osanai.hisashi@jp.fujitsu.com>
Bryan Keller <kellerbr@us.ibm.com>
Doug Hellmann <doug@doughellmann.com> <doug.hellmann@dreamhost.com>
+zhangdebo1987 <zhangdebo@inspur.com> zhangdebo
+Thomas Goirand <thomas@goirand.fr> <zigo@debian.org>