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 <[email protected]> <[email protected]>
6464
6565
Arnaud Porterie <[email protected]>
6666
67+
Arthur Flageul <[email protected]>
68+
6769
6870
69-
Austin Vazquez <[email protected]>
70-
71-
71+
Austin Vazquez <[email protected]>
72+
73+
74+
7275
7376
Ben Bonnefoy <[email protected]>
7477
Ben Golub <[email protected]>
@@ -150,6 +153,8 @@ Dave Henderson <[email protected]> <[email protected]>
150153
151154
David Alvarez <[email protected]>
152155
156+
David Dooling <[email protected]>
157+
153158
David Karlsson <[email protected]>
154159
155160
David M. Karr <[email protected]>

AUTHORS

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Andreas Köhler <[email protected]>
6363
Andres G. Aragoneses <[email protected]>
6464
Andres Leon Rangel <[email protected]>
6565
Andrew France <[email protected]>
66+
Andrew He <[email protected]>
6667
Andrew Hsu <[email protected]>
6768
Andrew Macpherson <[email protected]>
6869
Andrew McDonnell <[email protected]>
@@ -86,11 +87,12 @@ Archimedes Trajano <[email protected]>
8687
Arko Dasgupta <[email protected]>
8788
Arnaud Porterie <[email protected]>
8889
Arnaud Rebillout <[email protected]>
90+
Arthur Flageul <[email protected]>
8991
Arthur Peka <[email protected]>
9092
Ashly Mathew <[email protected]>
9193
Ashwini Oruganti <[email protected]>
9294
Aslam Ahemad <[email protected]>
93-
Austin Vazquez <austin.vazquez.dev@gmail.com>
95+
Austin Vazquez <austin.vazquez@docker.com>
9496
Azat Khuyiyakhmetov <[email protected]>
9597
Bardia Keyoumarsi <[email protected]>
9698
Barnaby Gray <[email protected]>
@@ -135,10 +137,12 @@ Cao Weiwei <[email protected]>
135137
Carlo Mion <[email protected]>
136138
Carlos Alexandro Becker <[email protected]>
137139
Carlos de Paula <[email protected]>
140+
carsontham <[email protected]>
138141
Carston Schilds <[email protected]>
139142
Casey Korver <[email protected]>
140143
141144
Cedric Davies <[email protected]>
145+
Cesar Talledo <[email protected]>
142146
Cezar Sa Espinola <[email protected]>
143147
Chad Faragher <[email protected]>
144148
Chao Wang <[email protected]>
@@ -220,7 +224,7 @@ David Alvarez <[email protected]>
220224
David Beitey <[email protected]>
221225
David Calavera <[email protected]>
222226
David Cramer <[email protected]>
223-
David Dooling <dooling@gmail.com>
227+
David Dooling <david.dooling@docker.com>
224228
David Gageot <[email protected]>
225229
David Karlsson <[email protected]>
226230
David le Blanc <[email protected]>
@@ -265,6 +269,7 @@ Eli Uriegas <[email protected]>
265269
Eli Uriegas <[email protected]>
266270
Elias Faxö <[email protected]>
267271
Elliot Luo <[email protected]>
272+
Eng Zer Jun <[email protected]>
268273
Eric Bode <[email protected]>
269274
Eric Curtin <[email protected]>
270275
Eric Engestrom <[email protected]>
@@ -345,6 +350,7 @@ Henning Sprang <[email protected]>
345350
346351
Hernan Garcia <[email protected]>
347352
Hongbin Lu <[email protected]>
353+
Hossein Abbasi <[email protected]>
348354
Hu Keping <[email protected]>
349355
Huayi Zhang <[email protected]>
350356
Hugo Chastel <[email protected]>
@@ -595,6 +601,7 @@ Michael Prokop <[email protected]>
595601
Michael Scharf <[email protected]>
596602
Michael Spetsiotis <[email protected]>
597603
Michael Steinert <[email protected]>
604+
Michael Tews <[email protected]>
598605
Michael West <[email protected]>
599606
Michal Minář <[email protected]>
600607
Michał Czeraszkiewicz <[email protected]>
@@ -896,6 +903,7 @@ Wenlong Zhang <[email protected]>
896903
Wenzhi Liang <[email protected]>
897904
Wes Morgan <[email protected]>
898905
Wewang Xiaorenfine <[email protected]>
906+
Will Wang <[email protected]>
899907
William Henry <[email protected]>
900908
Xianglin Gao <[email protected]>
901909
Xiaodong Liu <[email protected]>

0 commit comments

Comments
 (0)