Skip to content

Commit be97096

Browse files
authored
Merge pull request #6434 from thaJeztah/update_authors
update mailmap and authors
2 parents 4df42ef + c4a87de commit be97096

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

.mailmap

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,14 @@ Arko Dasgupta <arko@tetrate.io> <arko.dasgupta@docker.com>
6464
Arko Dasgupta <arko@tetrate.io> <arkodg@users.noreply.github.com>
6565
Arnaud Porterie <icecrime@gmail.com>
6666
Arnaud Porterie <icecrime@gmail.com> <arnaud.porterie@docker.com>
67+
Arthur Flageul <arthur.flageul@gmail.com>
68+
Arthur Flageul <arthur.flageul@gmail.com> <arthur.flageul@docker.com>
6769
Arthur Gautier <baloo@gandi.net> <superbaloo+registrations.github@superbaloo.net>
6870
Arthur Peka <arthur.peka@outlook.com> <arthrp@users.noreply.github.com>
69-
Austin Vazquez <austin.vazquez.dev@gmail.com>
70-
Austin Vazquez <austin.vazquez.dev@gmail.com> <55906459+austinvazquez@users.noreply.github.com>
71-
Austin Vazquez <austin.vazquez.dev@gmail.com> <macedonv@amazon.com>
71+
Austin Vazquez <austin.vazquez@docker.com>
72+
Austin Vazquez <austin.vazquez@docker.com> <55906459+austinvazquez@users.noreply.github.com>
73+
Austin Vazquez <austin.vazquez@docker.com> <austin.vazquez.dev@gmail.com>
74+
Austin Vazquez <austin.vazquez@docker.com> <macedonv@amazon.com>
7275
Avi Miller <avi.miller@oracle.com> <avi.miller@gmail.com>
7376
Ben Bonnefoy <frenchben@docker.com>
7477
Ben Golub <ben.golub@dotcloud.com>
@@ -150,6 +153,8 @@ Dave Henderson <dhenderson@gmail.com> <Dave.Henderson@ca.ibm.com>
150153
Dave Tucker <dt@docker.com> <dave@dtucker.co.uk>
151154
David Alvarez <david.alvarez@flyeralarm.com>
152155
David Alvarez <david.alvarez@flyeralarm.com> <busilezas@gmail.com>
156+
David Dooling <david.dooling@docker.com>
157+
David Dooling <david.dooling@docker.com> <dooling@gmail.com>
153158
David Karlsson <david.karlsson@docker.com>
154159
David Karlsson <david.karlsson@docker.com> <35727626+dvdksn@users.noreply.github.com>
155160
David M. Karr <davidmichaelkarr@gmail.com>

AUTHORS

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Andreas Köhler <andi5.py@gmx.net>
6363
Andres G. Aragoneses <knocte@gmail.com>
6464
Andres Leon Rangel <aleon1220@gmail.com>
6565
Andrew France <andrew@avito.co.uk>
66+
Andrew He <he.andrew.mail@gmail.com>
6667
Andrew Hsu <andrewhsu@docker.com>
6768
Andrew Macpherson <hopscotch23@gmail.com>
6869
Andrew McDonnell <bugs@andrewmcdonnell.net>
@@ -86,11 +87,12 @@ Archimedes Trajano <developer@trajano.net>
8687
Arko Dasgupta <arko@tetrate.io>
8788
Arnaud Porterie <icecrime@gmail.com>
8889
Arnaud Rebillout <elboulangero@gmail.com>
90+
Arthur Flageul <arthur.flageul@gmail.com>
8991
Arthur Peka <arthur.peka@outlook.com>
9092
Ashly Mathew <ashly.mathew@sap.com>
9193
Ashwini Oruganti <ashwini.oruganti@gmail.com>
9294
Aslam Ahemad <aslamahemad@gmail.com>
93-
Austin Vazquez <austin.vazquez.dev@gmail.com>
95+
Austin Vazquez <austin.vazquez@docker.com>
9496
Azat Khuyiyakhmetov <shadow_uz@mail.ru>
9597
Bardia Keyoumarsi <bkeyouma@ucsc.edu>
9698
Barnaby Gray <barnaby@pickle.me.uk>
@@ -135,10 +137,12 @@ Cao Weiwei <cao.weiwei30@zte.com.cn>
135137
Carlo Mion <mion00@gmail.com>
136138
Carlos Alexandro Becker <caarlos0@gmail.com>
137139
Carlos de Paula <me@carlosedp.com>
140+
carsontham <carsontham@outlook.com>
138141
Carston Schilds <Carston.Schilds@visier.com>
139142
Casey Korver <casey@korver.dev>
140143
Ce Gao <ce.gao@outlook.com>
141144
Cedric Davies <cedricda@microsoft.com>
145+
Cesar Talledo <cesar.talledo@docker.com>
142146
Cezar Sa Espinola <cezarsa@gmail.com>
143147
Chad Faragher <wyckster@hotmail.com>
144148
Chao Wang <wangchao.fnst@cn.fujitsu.com>
@@ -220,7 +224,7 @@ David Alvarez <david.alvarez@flyeralarm.com>
220224
David Beitey <david@davidjb.com>
221225
David Calavera <david.calavera@gmail.com>
222226
David Cramer <davcrame@cisco.com>
223-
David Dooling <dooling@gmail.com>
227+
David Dooling <david.dooling@docker.com>
224228
David Gageot <david@gageot.net>
225229
David Karlsson <david.karlsson@docker.com>
226230
David le Blanc <systemmonkey42@users.noreply.github.com>
@@ -265,6 +269,7 @@ Eli Uriegas <eli.uriegas@docker.com>
265269
Eli Uriegas <seemethere101@gmail.com>
266270
Elias Faxö <elias.faxo@tre.se>
267271
Elliot Luo <956941328@qq.com>
272+
Eng Zer Jun <engzerjun@gmail.com>
268273
Eric Bode <eric.bode@foundries.io>
269274
Eric Curtin <ericcurtin17@gmail.com>
270275
Eric Engestrom <eric@engestrom.ch>
@@ -345,6 +350,7 @@ Henning Sprang <henning.sprang@gmail.com>
345350
Henry N <henrynmail-github@yahoo.de>
346351
Hernan Garcia <hernandanielg@gmail.com>
347352
Hongbin Lu <hongbin034@gmail.com>
353+
Hossein Abbasi <16090309+hsnabszhdn@users.noreply.github.com>
348354
Hu Keping <hukeping@huawei.com>
349355
Huayi Zhang <irachex@gmail.com>
350356
Hugo Chastel <Hugo-C@users.noreply.github.com>
@@ -595,6 +601,7 @@ Michael Prokop <github@michael-prokop.at>
595601
Michael Scharf <github@scharf.gr>
596602
Michael Spetsiotis <michael_spets@hotmail.com>
597603
Michael Steinert <mike.steinert@gmail.com>
604+
Michael Tews <michael@tews.dev>
598605
Michael West <mwest@mdsol.com>
599606
Michal Minář <miminar@redhat.com>
600607
Michał Czeraszkiewicz <czerasz@gmail.com>
@@ -896,6 +903,7 @@ Wenlong Zhang <zhangwenlong@loongson.cn>
896903
Wenzhi Liang <wenzhi.liang@gmail.com>
897904
Wes Morgan <cap10morgan@gmail.com>
898905
Wewang Xiaorenfine <wang.xiaoren@zte.com.cn>
906+
Will Wang <willww64@gmail.com>
899907
William Henry <whenry@redhat.com>
900908
Xianglin Gao <xlgao@zju.edu.cn>
901909
Xiaodong Liu <liuxiaodong@loongson.cn>

0 commit comments

Comments
 (0)