Merge pull request #2665 from dmcgowan/update-mailmap

dmcgowan · web-flow · commit 308d3cb60e12 · 2018-09-19T14:59:50.000-07:00
Update mailmap
diff --git a/.mailmap b/.mailmap
@@ -17,3 +17,9 @@ Stephen J Day <stevvooe@gmail.com> Stephen Day <stevvooe@users.noreply.github.co
 Stephen J Day <stevvooe@gmail.com> Stephen Day <stephen.day@getcruise.com>
 Sudeesh John <sudeesh@linux.vnet.ibm.com> sudeesh john <sudeesh@linux.vnet.ibm.com>
 Tõnis Tiigi <tonistiigi@gmail.com> Tonis Tiigi <tonistiigi@gmail.com>
+Lifubang <lifubang@aliyun.com> Lifubang <lifubang@acmcoder.com>
+Xiaodong Zhang <a4012017@sina.com> nashasha1 <a4012017@sina.com>
+Jian Liao <jliao@alauda.io> liaoj <jliao@alauda.io>
+Jian Liao <jliao@alauda.io> liaojian <liaojian@Dabllo.local>
+Rui Cao <ruicao@alauda.io> ruicao <ruicao@alauda.io>
+Yan Xuean <yan.xuean@zte.com.cn> yanxuean <yan.xuean@zte.com.cn>

-Original file line number
+Diff line change
 Stephen J Day <[email protected]> Stephen Day <[email protected]>
 Sudeesh John <[email protected]> sudeesh john <[email protected]>
 Tõnis Tiigi <[email protected]> Tonis Tiigi <[email protected]>
 +Lifubang <[email protected]> Lifubang <[email protected]>
 +Xiaodong Zhang <[email protected]> nashasha1 <[email protected]>
 +Jian Liao <[email protected]> liaoj <[email protected]>
 +Jian Liao <[email protected]> liaojian <[email protected]>
 +Rui Cao <[email protected]> ruicao <[email protected]>
 +Yan Xuean <[email protected]> yanxuean <[email protected]>