Merge pull request #4038 from thaJeztah/1.3_update_mailmap

estesp · web-flow · commit 2d8cc4051231 · 2020-02-18T09:49:27.000-05:00
[release/1.3] Update .mailmap with changes from master
diff --git a/.mailmap b/.mailmap
@@ -1,39 +1,76 @@
 Abhinandan Prativadi <abhi@docker.com>
 Abhinandan Prativadi <abhi@docker.com> <aprativadi@gmail.com>
+Ace-Tang <aceapril@126.com>
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> <suda.akihiro@lab.ntt.co.jp>
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> <suda.kyoto@gmail.com>
+Allen Sun <shlallen1990@gmail.com> <allensun@AllenSundeMacBook-Pro.local>
+Alexander Morozov <lk4d4math@gmail.com> <lk4d4@docker.com>
+Amit Krishnan <krish.amit@gmail.com> <amit.krishnan@oracle.com>
 Andrei Vagin <avagin@virtuozzo.com> <avagin@openvz.org>
 Andrey Kolomentsev <andrey.kolomentsev@gmail.com>
+Arnaud Porterie <icecrime@gmail.com>
+Arnaud Porterie <icecrime@gmail.com> <arnaud.porterie@docker.com>
+Bob Mader <swapdisk@users.noreply.github.com>
+Boris Popovschi <zyqsempai@mail.ru>
 Brent Baude <bbaude@redhat.com>
+Cao Zhihao <caozhihao@163.com>
+Cao Zhihao <caozhihao@163.com> <caozhihao.xd@bytedance.com>
 Carlos Eduardo <me@carlosedp.com> <me@carlosedp.com>
+Cristian Staretu <cristian.staretu@gmail.com>
+Cristian Staretu <cristian.staretu@gmail.com> <unclejack@users.noreply.github.com>
+Daniel Dao <dqminh89@gmail.com>
+Edgar Lee <edgarl@netflix.com> <edgar.lee@docker.com>
 Eric Ren <renzhen.rz@alibaba-linux.com> <renzhen.rz@alibaba-inc.com>
+Fahed Dorgaa <fahed.dorgaa@gmail.com>
 Frank Yang <yyb196@gmail.com>
+Fupan Li <lifupan@gmail.com>
 Georgia Panoutsakopoulou <gpanoutsak@gmail.com>
 Guangming Wang <guangming.wang@daocloud.io>
 Haiyan Meng <haiyanmeng@google.com>
+Harry Zhang <harryz@hyper.sh> <harryzhang@zju.edu.cn>
+Hu Shuai <hus.fnst@cn.fujitsu.com>
+Hu Shuai <hus.fnst@cn.fujitsu.com> <hushuaiia@qq.com>
+Jaana Burcu Dogan <burcujdogan@gmail.com> <jbd@golang.org>
+Jess Valarezo <valarezo.jessica@gmail.com>
+Jess Valarezo <valarezo.jessica@gmail.com> <jessica.valarezo@docker.com>
 Jian Liao <jliao@alauda.io>
 Jian Liao <jliao@alauda.io> <liaojian@Dabllo.local>
 Ji'an Liu <anthonyliu@zju.edu.cn>
 Jie Zhang <iamkadisi@163.com>
-John Howard <john.howard@microsoft.com> <jhoward@microsoft.com>
-John Howard <john.howard@microsoft.com> <jhowardmsft@users.noreply.github.com>
+John Howard <github@lowenna.com>
+John Howard <github@lowenna.com> <john.howard@microsoft.com>
+John Howard <github@lowenna.com> <jhoward@microsoft.com>
+John Howard <github@lowenna.com> <jhowardmsft@users.noreply.github.com>
+Luc Perkins <lucperkins@gmail.com>
 Julien Balestra <julien.balestra@datadoghq.com>
 Justin Cormack <justin.cormack@docker.com> <justin@specialbusservice.com>
 Justin Terry <juterry@microsoft.com>
 Justin Terry <juterry@microsoft.com> <jterry75@users.noreply.github.com>
 Kenfe-Mickaël Laventure <mickael.laventure@gmail.com>
+Kevin Kern <kaiwentan@harmonycloud.cn>
 Kevin Xu <cming.xu@gmail.com>
+Kohei Tokunaga <ktokunaga.mail@gmail.com>
+Krasi Georgiev <krasi.root@gmail.com> <krasi@vip-consult.solutions>
+Lantao Liu <lantaol@google.com>
 Lantao Liu <lantaol@google.com> <taotaotheripper@gmail.com>
 Lifubang <lifubang@aliyun.com> <lifubang@acmcoder.com>
 Lu Jingxiao <lujingxiao@huawei.com>
 Maksym Pavlenko <makpav@amazon.com> <pavlenko.maksym@gmail.com>
+Mario Hros <spam@k3a.me>
+Mario Hros <spam@k3a.me> <root@k3a.me>
 Mark Gordon <msg555@gmail.com>
 Michael Katsoulis <michaelkatsoulis88@gmail.com>
 Mike Brown <brownwm@us.ibm.com> <mikebrow@users.noreply.github.com>
 Nishchay Kumar <mrawesomenix@gmail.com>
+Oliver Stenbom <oliver@stenbom.eu> <ostenbom@pivotal.io>
 Phil Estes <estesp@gmail.com> <estesp@linux.vnet.ibm.com>
+Reid Li <reid.li@utexas.edu>
+Ross Boucher <rboucher@gmail.com>
+Ruediger Maass <ruediger.maass@de.ibm.com>
 Rui Cao <ruicao@alauda.io> <ruicao@alauda.io>
+Sakeven Jiang <jc5930@sina.cn>
 Seth Pellegrino <spellegrino@newrelic.com> <30441101+sethp-nr@users.noreply.github.com>
+Shengbo Song <thomassong@tencent.com>
 Stephen J Day <stevvooe@gmail.com> <stephen.day@getcruise.com>
 Stephen J Day <stevvooe@gmail.com> <stevvooe@users.noreply.github.com>
 Stephen J Day <stevvooe@gmail.com> <stephen.day@docker.com>
@@ -43,8 +80,11 @@ Tõnis Tiigi <tonistiigi@gmail.com>
 Wei Fu <fuweid89@gmail.com> <fhfuwei@163.com>
 Xiaodong Zhang <a4012017@sina.com>
 Xuean Yan <yan.xuean@zte.com.cn>
+Yue Zhang <zy675793960@yeah.net>
 Yuxing Liu <starnop@163.com>
-zhenguang zhu <zhengguang.zhu@daocloud.io>
-zhongming chang<zhongming.chang@daocloud.io>
-zhoulin xie <zhoulin.xie@daocloud.io>
-zhoulin xie <zhoulin.xie@daocloud.io> <42261994+JoeWrightss@users.noreply.github.com>
+Zhang Wei <zhangwei555@huawei.com>
+Zhenguang Zhu <zhengguang.zhu@daocloud.io>
+Zhongming Chang<zhongming.chang@daocloud.io>
+Zhoulin Xie <zhoulin.xie@daocloud.io>
+Zhoulin Xie <zhoulin.xie@daocloud.io> <42261994+JoeWrightss@users.noreply.github.com>
+张潇 <xiaozhang0210@hotmail.com>

-Original file line number
+Diff line change
@@ @@ -1,39 +1,76 @@ @@
 Abhinandan Prativadi <[email protected]>
 Abhinandan Prativadi <[email protected]> <[email protected]>
 +Ace-Tang <[email protected]>
 Akihiro Suda <[email protected]> <[email protected]>
 Akihiro Suda <[email protected]> <[email protected]>
 +Allen Sun <[email protected]> <[email protected]>
 +Alexander Morozov <[email protected]> <[email protected]>
 +Amit Krishnan <[email protected]> <[email protected]>
 Andrei Vagin <[email protected]> <[email protected]>
 Andrey Kolomentsev <[email protected]>
 +Arnaud Porterie <[email protected]>
 +Arnaud Porterie <[email protected]> <[email protected]>
 +Bob Mader <[email protected]>
 +Boris Popovschi <[email protected]>
 Brent Baude <[email protected]>
 +Cao Zhihao <[email protected]>
 +Cao Zhihao <[email protected]> <[email protected]>
 Carlos Eduardo <[email protected]> <[email protected]>
 +Cristian Staretu <[email protected]>
 +Cristian Staretu <[email protected]> <[email protected]>
 +Daniel Dao <[email protected]>
 +Edgar Lee <[email protected]> <[email protected]>
 Eric Ren <[email protected]> <[email protected]>
 +Fahed Dorgaa <[email protected]>
 Frank Yang <[email protected]>
 +Fupan Li <[email protected]>
 Georgia Panoutsakopoulou <[email protected]>
 Guangming Wang <[email protected]>
 Haiyan Meng <[email protected]>
 +Harry Zhang <[email protected]> <[email protected]>
 +Hu Shuai <[email protected]>
 +Hu Shuai <[email protected]> <[email protected]>
 +Jaana Burcu Dogan <[email protected]> <[email protected]>
 +Jess Valarezo <[email protected]>
 +Jess Valarezo <[email protected]> <[email protected]>
 Jian Liao <[email protected]>
 Jian Liao <[email protected]> <[email protected]>
 Ji'an Liu <[email protected]>
 Jie Zhang <[email protected]>
 -John Howard <[email protected]> <[email protected]>
 -John Howard <[email protected]> <[email protected]>
 +John Howard <[email protected]>
 +John Howard <[email protected]> <[email protected]>
 +John Howard <[email protected]> <[email protected]>
 +John Howard <[email protected]> <[email protected]>
 +Luc Perkins <[email protected]>
 Julien Balestra <[email protected]>
 Justin Cormack <[email protected]> <[email protected]>
 Justin Terry <[email protected]>
 Justin Terry <[email protected]> <[email protected]>
 Kenfe-Mickaël Laventure <[email protected]>
 +Kevin Kern <[email protected]>
 Kevin Xu <[email protected]>
 +Kohei Tokunaga <[email protected]>
 +Krasi Georgiev <[email protected]> <[email protected]>
 +Lantao Liu <[email protected]>
 Lantao Liu <[email protected]> <[email protected]>
 Lifubang <[email protected]> <[email protected]>
 Lu Jingxiao <[email protected]>
 Maksym Pavlenko <[email protected]> <[email protected]>
 +Mario Hros <[email protected]>
 +Mario Hros <[email protected]> <[email protected]>
 Mark Gordon <[email protected]>
 Michael Katsoulis <[email protected]>
 Mike Brown <[email protected]> <[email protected]>
 Nishchay Kumar <[email protected]>
 +Oliver Stenbom <[email protected]> <[email protected]>
 Phil Estes <[email protected]> <[email protected]>
 +Reid Li <[email protected]>
 +Ross Boucher <[email protected]>
 +Ruediger Maass <[email protected]>
 Rui Cao <[email protected]> <[email protected]>
 +Sakeven Jiang <[email protected]>
 Seth Pellegrino <[email protected]> <[email protected]>
 +Shengbo Song <[email protected]>
 Stephen J Day <[email protected]> <[email protected]>
 Stephen J Day <[email protected]> <[email protected]>
 Stephen J Day <[email protected]> <[email protected]>
 Wei Fu <[email protected]> <[email protected]>
 Xiaodong Zhang <[email protected]>
 Xuean Yan <[email protected]>
 +Yue Zhang <[email protected]>
 Yuxing Liu <[email protected]>
 -zhenguang zhu <[email protected]>
 -zhongming chang<[email protected]>
 -zhoulin xie <[email protected]>
 -zhoulin xie <[email protected]> <[email protected]>
 +Zhang Wei <[email protected]>
 +Zhenguang Zhu <[email protected]>
 +Zhongming Chang<[email protected]>
 +Zhoulin Xie <[email protected]>
 +Zhoulin Xie <[email protected]> <[email protected]>
 +张潇 <[email protected]>