Skip to content

Commit 8752709

Browse files
authored
Merge pull request #6071 from thaJeztah/update_authors2
update authors and mailmap
2 parents 77fbbc3 + 49f2dd0 commit 8752709

File tree

2 files changed

+42
-2
lines changed

2 files changed

+42
-2
lines changed

.mailmap

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Alexis Couvreur <alexiscouvreur.pro@gmail.com>
4343
Alicia Lauerman <alicia@eta.im> <allydevour@me.com>
4444
Allen Sun <allensun.shl@alibaba-inc.com> <allen.sun@daocloud.io>
4545
Allen Sun <allensun.shl@alibaba-inc.com> <shlallen1990@gmail.com>
46+
Allie Sadler <allie.sadler@docker.com>
4647
Andrew Weiss <andrew.weiss@docker.com> <andrew.weiss@microsoft.com>
4748
Andrew Weiss <andrew.weiss@docker.com> <andrew.weiss@outlook.com>
4849
André Martins <aanm90@gmail.com> <martins@noironetworks.com>
@@ -65,6 +66,9 @@ Arnaud Porterie <icecrime@gmail.com>
6566
Arnaud Porterie <icecrime@gmail.com> <arnaud.porterie@docker.com>
6667
Arthur Gautier <baloo@gandi.net> <superbaloo+registrations.github@superbaloo.net>
6768
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>
6872
Avi Miller <avi.miller@oracle.com> <avi.miller@gmail.com>
6973
Ben Bonnefoy <frenchben@docker.com>
7074
Ben Golub <ben.golub@dotcloud.com>
@@ -195,6 +199,8 @@ Gaetan de Villele <gdevillele@gmail.com>
195199
Gang Qiao <qiaohai8866@gmail.com> <1373319223@qq.com>
196200
George Kontridze <george@bugsnag.com>
197201
Gerwim Feiken <g.feiken@tfe.nl> <gerwim@gmail.com>
202+
Giau. Tran Minh <hello@giautm.dev>
203+
Giau. Tran Minh <hello@giautm.dev> <12751435+giautm@users.noreply.github.com>
198204
Giampaolo Mancini <giampaolo@trampolineup.com>
199205
Gopikannan Venugopalsamy <gopikannan.venugopalsamy@gmail.com>
200206
Gou Rao <gou@portworx.com> <gourao@users.noreply.github.com>
@@ -214,6 +220,7 @@ Günther Jungbluth <gunther@gameslabs.net>
214220
Hakan Özler <hakan.ozler@kodcu.com>
215221
Hao Shu Wei <haosw@cn.ibm.com>
216222
Hao Shu Wei <haosw@cn.ibm.com> <haoshuwei1989@163.com>
223+
Harald Albers <github@albersweb.de>
217224
Harald Albers <github@albersweb.de> <albers@users.noreply.github.com>
218225
Harold Cooper <hrldcpr@gmail.com>
219226
Harry Zhang <harryz@hyper.sh> <harryzhang@zju.edu.cn>
@@ -330,6 +337,8 @@ Lajos Papp <lajos.papp@sequenceiq.com> <lalyos@yahoo.com>
330337
Lei Jitang <leijitang@huawei.com>
331338
Lei Jitang <leijitang@huawei.com> <leijitang@gmail.com>
332339
Li Fu Bang <lifubang@acmcoder.com>
340+
Li Yi <denverdino@gmail.com>
341+
Li Yi <denverdino@gmail.com> <weiyuan.yl@alibaba-inc.com>
333342
Liang Mingqiang <mqliang.zju@gmail.com>
334343
Liang-Chi Hsieh <viirya@gmail.com>
335344
Liao Qingwei <liaoqingwei@huawei.com>
@@ -339,6 +348,7 @@ Lokesh Mandvekar <lsm5@fedoraproject.org> <lsm5@redhat.com>
339348
Lorenzo Fontana <lo@linux.com> <fontanalorenzo@me.com>
340349
Louis Opter <kalessin@kalessin.fr>
341350
Louis Opter <kalessin@kalessin.fr> <louis@dotcloud.com>
351+
Lovekesh Kumar <lovekesh.kumar@rtcamp.com>
342352
Luca Favatella <luca.favatella@erlang-solutions.com> <lucafavatella@users.noreply.github.com>
343353
Luke Marsden <me@lukemarsden.net> <luke@digital-crocus.com>
344354
Lyn <energylyn@zju.edu.cn>
@@ -396,6 +406,7 @@ Mike Dalton <mikedalton@github.com> <19153140+mikedalton@users.noreply.github.co
396406
Mike Goelzer <mike.goelzer@docker.com> <mgoelzer@docker.com>
397407
Milind Chawre <milindchawre@gmail.com>
398408
Misty Stanley-Jones <misty@docker.com> <misty@apache.org>
409+
Mohammad Hossein <mhm98035@gmail.com>
399410
Mohit Soni <mosoni@ebay.com> <mohitsoni1989@gmail.com>
400411
Moorthy RS <rsmoorthy@gmail.com> <rsmoorthy@users.noreply.github.com>
401412
Morten Hekkvang <morten.hekkvang@sbab.se>
@@ -419,6 +430,7 @@ O.S. Tezer <ostezer@gmail.com> <ostezer@users.noreply.github.com>
419430
Oh Jinkyun <tintypemolly@gmail.com> <tintypemolly@Ohui-MacBook-Pro.local>
420431
Oliver Pomeroy <oppomeroy@gmail.com>
421432
Ouyang Liduo <oyld0210@163.com>
433+
Patrick St. laurent <patrick@saint-laurent.us>
422434
Patrick Stapleton <github@gdi2290.com>
423435
Paul Liljenberg <liljenberg.paul@gmail.com> <letters@paulnotcom.se>
424436
Pavel Tikhomirov <ptikhomirov@virtuozzo.com> <ptikhomirov@parallels.com>
@@ -498,6 +510,7 @@ Stephen Day <stevvooe@gmail.com> <stephen.day@docker.com>
498510
Stephen Day <stevvooe@gmail.com> <stevvooe@users.noreply.github.com>
499511
Steve Desmond <steve@vtsv.ca> <stevedesmond-ca@users.noreply.github.com>
500512
Steve Richards <steve.richards@docker.com> stevejr <>
513+
Stuart Williams <pid@pidster.com>
501514
Sun Gengze <690388648@qq.com>
502515
Sun Jianbo <wonderflow.sun@gmail.com>
503516
Sun Jianbo <wonderflow.sun@gmail.com> <wonderflow@zju.edu.cn>

AUTHORS

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ Alfred Landrum <alfred.landrum@docker.com>
4848
Ali Rostami <rostami.ali@gmail.com>
4949
Alicia Lauerman <alicia@eta.im>
5050
Allen Sun <allensun.shl@alibaba-inc.com>
51+
Allie Sadler <allie.sadler@docker.com>
5152
Alvin Deng <alvin.q.deng@utexas.edu>
5253
Amen Belayneh <amenbelayneh@gmail.com>
5354
Amey Shrivastava <72866602+AmeyShrivastava@users.noreply.github.com>
@@ -81,13 +82,15 @@ Antonis Kalipetis <akalipetis@gmail.com>
8182
Anusha Ragunathan <anusha.ragunathan@docker.com>
8283
Ao Li <la9249@163.com>
8384
Arash Deshmeh <adeshmeh@ca.ibm.com>
85+
Archimedes Trajano <developer@trajano.net>
8486
Arko Dasgupta <arko@tetrate.io>
8587
Arnaud Porterie <icecrime@gmail.com>
8688
Arnaud Rebillout <elboulangero@gmail.com>
8789
Arthur Peka <arthur.peka@outlook.com>
8890
Ashly Mathew <ashly.mathew@sap.com>
8991
Ashwini Oruganti <ashwini.oruganti@gmail.com>
9092
Aslam Ahemad <aslamahemad@gmail.com>
93+
Austin Vazquez <austin.vazquez.dev@gmail.com>
9194
Azat Khuyiyakhmetov <shadow_uz@mail.ru>
9295
Bardia Keyoumarsi <bkeyouma@ucsc.edu>
9396
Barnaby Gray <barnaby@pickle.me.uk>
@@ -132,6 +135,7 @@ Cao Weiwei <cao.weiwei30@zte.com.cn>
132135
Carlo Mion <mion00@gmail.com>
133136
Carlos Alexandro Becker <caarlos0@gmail.com>
134137
Carlos de Paula <me@carlosedp.com>
138+
Carston Schilds <Carston.Schilds@visier.com>
135139
Casey Korver <casey@korver.dev>
136140
Ce Gao <ce.gao@outlook.com>
137141
Cedric Davies <cedricda@microsoft.com>
@@ -189,6 +193,7 @@ Daisuke Ito <itodaisuke00@gmail.com>
189193
dalanlan <dalanlan925@gmail.com>
190194
Damien Nadé <github@livna.org>
191195
Dan Cotora <dan@bluevision.ro>
196+
Dan Wallis <dan@wallis.nz>
192197
Danial Gharib <danial.mail.gh@gmail.com>
193198
Daniel Artine <daniel.artine@ufrj.br>
194199
Daniel Cassidy <mail@danielcassidy.me.uk>
@@ -237,6 +242,7 @@ Deshi Xiao <dxiao@redhat.com>
237242
Dharmit Shah <shahdharmit@gmail.com>
238243
Dhawal Yogesh Bhanushali <dbhanushali@vmware.com>
239244
Dieter Reuter <dieter.reuter@me.com>
245+
Dilep Dev <34891655+DilepDev@users.noreply.github.com>
240246
Dima Stopel <dima@twistlock.com>
241247
Dimitry Andric <d.andric@activevideo.com>
242248
Ding Fei <dingfei@stars.org.cn>
@@ -308,6 +314,8 @@ George MacRorie <gmacr31@gmail.com>
308314
George Margaritis <gmargaritis@protonmail.com>
309315
George Xie <georgexsh@gmail.com>
310316
Gianluca Borello <g.borello@gmail.com>
317+
Giau. Tran Minh <hello@giautm.dev>
318+
Giedrius Jonikas <giedriusj1@gmail.com>
311319
Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
312320
Gio d'Amelio <giodamelio@gmail.com>
313321
Gleb Stsenov <gleb.stsenov@gmail.com>
@@ -344,6 +352,7 @@ Hugo Gabriel Eyherabide <hugogabriel.eyherabide@gmail.com>
344352
huqun <huqun@zju.edu.cn>
345353
Huu Nguyen <huu@prismskylabs.com>
346354
Hyzhou Zhy <hyzhou.zhy@alibaba-inc.com>
355+
Iain MacDonald <IJMacD@gmail.com>
347356
Iain Samuel McLean Elder <iain@isme.es>
348357
Ian Campbell <ian.campbell@docker.com>
349358
Ian Philpot <ian.philpot@microsoft.com>
@@ -393,6 +402,7 @@ Jesse Adametz <jesseadametz@gmail.com>
393402
Jessica Frazelle <jess@oxide.computer>
394403
Jezeniel Zapanta <jpzapanta22@gmail.com>
395404
Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
405+
Jianyong Wu <wujianyong@hygon.cn>
396406
Jie Luo <luo612@zju.edu.cn>
397407
Jilles Oldenbeuving <ojilles@gmail.com>
398408
Jim Chen <njucjc@gmail.com>
@@ -446,6 +456,7 @@ Julian <gitea+julian@ic.thejulian.uk>
446456
Julien Barbier <write0@gmail.com>
447457
Julien Kassar <github@kassisol.com>
448458
Julien Maitrehenry <julien.maitrehenry@me.com>
459+
Julio Cesar Garcia <juliogarciamelgarejo@gmail.com>
449460
Justas Brazauskas <brazauskasjustas@gmail.com>
450461
Justin Chadwell <me@jedevc.com>
451462
Justin Cormack <justin.cormack@docker.com>
@@ -490,19 +501,22 @@ Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
490501
Kyle Mitofsky <Kylemit@gmail.com>
491502
Lachlan Cooper <lachlancooper@gmail.com>
492503
Lai Jiangshan <jiangshanlai@gmail.com>
504+
Lajos Papp <lajos.papp@sequenceiq.com>
493505
Lars Kellogg-Stedman <lars@redhat.com>
494506
Laura Brehm <laurabrehm@hey.com>
495507
Laura Frank <ljfrank@gmail.com>
496508
Laurent Erignoux <lerignoux@gmail.com>
509+
Laurent Goderre <laurent.goderre@docker.com>
497510
Lee Gaines <eightlimbed@gmail.com>
498511
Lei Jitang <leijitang@huawei.com>
499512
Lennie <github@consolejunkie.net>
513+
lentil32 <lentil32@icloud.com>
500514
Leo Gallucci <elgalu3@gmail.com>
501515
Leonid Skorospelov <leosko94@gmail.com>
502516
Lewis Daly <lewisdaly@me.com>
503517
Li Fu Bang <lifubang@acmcoder.com>
504518
Li Yi <denverdino@gmail.com>
505-
Li Yi <weiyuan.yl@alibaba-inc.com>
519+
Li Zeghong <zeghong@hotmail.com>
506520
Liang-Chi Hsieh <viirya@gmail.com>
507521
Lihua Tang <lhtang@alauda.io>
508522
Lily Guo <lily.guo@docker.com>
@@ -515,6 +529,7 @@ lixiaobing10051267 <li.xiaobing1@zte.com.cn>
515529
Lloyd Dewolf <foolswisdom@gmail.com>
516530
Lorenzo Fontana <lo@linux.com>
517531
Louis Opter <kalessin@kalessin.fr>
532+
Lovekesh Kumar <lovekesh.kumar@rtcamp.com>
518533
Luca Favatella <luca.favatella@erlang-solutions.com>
519534
Luca Marturana <lucamarturana@gmail.com>
520535
Lucas Chan <lucas-github@lucaschan.com>
@@ -559,13 +574,15 @@ Matt Robenolt <matt@ydekproductions.com>
559574
Matteo Orefice <matteo.orefice@bites4bits.software>
560575
Matthew Heon <mheon@redhat.com>
561576
Matthieu Hauglustaine <matt.hauglustaine@gmail.com>
577+
Matthieu MOREL <matthieu.morel35@gmail.com>
562578
Mauro Porras P <mauroporrasp@gmail.com>
563579
Max Shytikov <mshytikov@gmail.com>
564580
Max-Julian Pogner <max-julian@pogner.at>
565581
Maxime Petazzoni <max@signalfuse.com>
566582
Maximillian Fan Xavier <maximillianfx@gmail.com>
567583
Mei ChunTao <mei.chuntao@zte.com.cn>
568584
Melroy van den Berg <melroy@melroy.org>
585+
Mert Şişmanoğlu <mert190737fb@gmail.com>
569586
Metal <2466052+tedhexaflow@users.noreply.github.com>
570587
Micah Zoltu <micah@newrelic.com>
571588
Michael A. Smith <michael@smith-li.com>
@@ -598,7 +615,9 @@ Mindaugas Rukas <momomg@gmail.com>
598615
Miroslav Gula <miroslav.gula@naytrolabs.com>
599616
Misty Stanley-Jones <misty@docker.com>
600617
Mohammad Banikazemi <mb@us.ibm.com>
618+
Mohammad Hossein <mhm98035@gmail.com>
601619
Mohammed Aaqib Ansari <maaquib@gmail.com>
620+
Mohammed Aminu Futa <mohammedfuta2000@gmail.com>
602621
Mohini Anne Dsouza <mohini3917@gmail.com>
603622
Moorthy RS <rsmoorthy@gmail.com>
604623
Morgan Bauer <mbauer@us.ibm.com>
@@ -633,9 +652,11 @@ Nicolas De Loof <nicolas.deloof@gmail.com>
633652
Nikhil Chawla <chawlanikhil24@gmail.com>
634653
Nikolas Garofil <nikolas.garofil@uantwerpen.be>
635654
Nikolay Milovanov <nmil@itransformers.net>
655+
NinaLua <iturf@sina.cn>
636656
Nir Soffer <nsoffer@redhat.com>
637657
Nishant Totla <nishanttotla@gmail.com>
638658
NIWA Hideyuki <niwa.niwa@nifty.ne.jp>
659+
Noah Silas <noah@hustle.com>
639660
Noah Treuhaft <noah.treuhaft@docker.com>
640661
O.S. Tezer <ostezer@gmail.com>
641662
Oded Arbel <oded@geek.co.il>
@@ -653,10 +674,12 @@ Patrick Böänziger <patrick.baenziger@bsi-software.com>
653674
Patrick Daigle <114765035+pdaig@users.noreply.github.com>
654675
Patrick Hemmer <patrick.hemmer@gmail.com>
655676
Patrick Lang <plang@microsoft.com>
677+
Patrick St. laurent <patrick@saint-laurent.us>
656678
Paul <paul9869@gmail.com>
657679
Paul Kehrer <paul.l.kehrer@gmail.com>
658680
Paul Lietar <paul@lietar.net>
659681
Paul Mulders <justinkb@gmail.com>
682+
Paul Rogalski <mail@paul-rogalski.de>
660683
Paul Seyfert <pseyfert.mathphys@gmail.com>
661684
Paul Weaver <pauweave@cisco.com>
662685
Pavel Pospisil <pospispa@gmail.com>
@@ -678,7 +701,6 @@ Philip Alexander Etling <paetling@gmail.com>
678701
Philipp Gillé <philipp.gille@gmail.com>
679702
Philipp Schmied <pschmied@schutzwerk.com>
680703
Phong Tran <tran.pho@northeastern.edu>
681-
pidster <pid@pidster.com>
682704
Pieter E Smit <diepes@github.com>
683705
pixelistik <pixelistik@users.noreply.github.com>
684706
Pratik Karki <prertik@outlook.com>
@@ -738,6 +760,7 @@ Samuel Cochran <sj26@sj26.com>
738760
Samuel Karp <skarp@amazon.com>
739761
Sandro Jäckel <sandro.jaeckel@gmail.com>
740762
Santhosh Manohar <santhosh@docker.com>
763+
Sarah Sanders <sarah.sanders@docker.com>
741764
Sargun Dhillon <sargun@netflix.com>
742765
Saswat Bhattacharya <sas.saswat@gmail.com>
743766
Saurabh Kumar <saurabhkumar0184@gmail.com>
@@ -770,6 +793,7 @@ Spencer Brown <spencer@spencerbrown.org>
770793
Spring Lee <xi.shuai@outlook.com>
771794
squeegels <lmscrewy@gmail.com>
772795
Srini Brahmaroutu <srbrahma@us.ibm.com>
796+
Stavros Panakakis <stavrospanakakis@gmail.com>
773797
Stefan S. <tronicum@user.github.com>
774798
Stefan Scherer <stefan.scherer@docker.com>
775799
Stefan Weil <sw@weilnetz.de>
@@ -780,6 +804,7 @@ Steve Durrheimer <s.durrheimer@gmail.com>
780804
Steve Richards <steve.richards@docker.com>
781805
Steven Burgess <steven.a.burgess@hotmail.com>
782806
Stoica-Marcu Floris-Andrei <floris.sm@gmail.com>
807+
Stuart Williams <pid@pidster.com>
783808
Subhajit Ghosh <isubuz.g@gmail.com>
784809
Sun Jianbo <wonderflow.sun@gmail.com>
785810
Sune Keller <absukl@almbrand.dk>
@@ -867,6 +892,7 @@ Wang Yumu <37442693@qq.com>
867892
Wataru Ishida <ishida.wataru@lab.ntt.co.jp>
868893
Wayne Song <wsong@docker.com>
869894
Wen Cheng Ma <wenchma@cn.ibm.com>
895+
Wenlong Zhang <zhangwenlong@loongson.cn>
870896
Wenzhi Liang <wenzhi.liang@gmail.com>
871897
Wes Morgan <cap10morgan@gmail.com>
872898
Wewang Xiaorenfine <wang.xiaoren@zte.com.cn>
@@ -908,3 +934,4 @@ Zhuo Zhi <h.dwwwwww@gmail.com>
908934
Átila Camurça Alves <camurca.home@gmail.com>
909935
Александр Менщиков <__Singleton__@hackerdom.ru>
910936
徐俊杰 <paco.xu@daocloud.io>
937+
林博仁 Buo-ren Lin <Buo.Ren.Lin@gmail.com>

0 commit comments

Comments
 (0)