summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJohn Dickinson <me@not.mn>2016-06-01 15:46:32 -0700
committerJohn Dickinson <me@not.mn>2016-06-07 15:11:27 -0700
commit88dbbe88bb8bc773171ebe1c94bfb821ca740e34 (patch)
tree427a5f2c140e7c49cbfa39eaa0efb0d96c08ccca /.mailmap
parentc40de1cbc808400edeaaed7e46ea3f8e0ce15d04 (diff)
downloadswift-88dbbe88bb8bc773171ebe1c94bfb821ca740e34.tar.gz
AUTHORS/CHANGELOG updates for 2.8.0 release2.8.0
Change-Id: I0dba970b2970139bd9847d1abf74eed1a8a4996c
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 4 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index f82346287..37cbd5b12 100644
--- a/.mailmap
+++ b/.mailmap
@@ -97,9 +97,12 @@ Daisuke Morita <morita.daisuke@ntti3.com> <morita.daisuke@lab.ntt.co.jp>
Andreas Jaeger <aj@suse.de> <aj@suse.com>
Hugo Kuo <tonytkdk@gmail.com>
Gage Hugo <gh159m@att.com>
-Oshrit Feder <oshritf@il.ibm.com>
+Oshrit Feder <oshritf@il.ibm.com> <OSHRITF@il.ibm.com>
Larry Rensing <lr699s@att.com>
Ben Keller <bjkeller@us.ibm.com>
Chaozhe Chen <chaozhe.chen@easystack.cn>
Brian Cline <bcline@softlayer.com> <bcline@us.ibm.com>
Brian Cline <bcline@softlayer.com> <brian.cline@gmail.com>
+Dharmendra Kushwaha <dharmendra.kushwaha@nectechnologies.in>
+Zhang Guoqing <zhang.guoqing@99cloud.net>
+Kato Tomoyuki <kato.tomoyuki@jp.fujitsu.com>