github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Update AUTHORS

Browse Source 
Also tweak .mailmap to dedup w9n and fix Alice Frosi's email address

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2018-02-27 21:48:34 +00:00
parent 58f2644354
commit 371c9f97b2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.mailmap
View File

@ -6,6 +6,7 @@
# #
# For explanation on this file format: man git-shortlog # For explanation on this file format: man git-shortlog
Alice Frosi <alice@linux.vnet.ibm.com> <alice@linux.vnet.ibm.comx>
Amir Chaudhry <amir.chaudhry@docker.com> <amirmc@gmail.com> Amir Chaudhry <amir.chaudhry@docker.com> <amirmc@gmail.com>
Anil Madhavapeddy <anil.madhavapeddy@docker.com> <anil@recoil.org> Anil Madhavapeddy <anil.madhavapeddy@docker.com> <anil@recoil.org>
Dan Finneran <dan@thebsdbox.co.uk> <dan@dev.fnnrn.me> Dan Finneran <dan@thebsdbox.co.uk> <dan@dev.fnnrn.me>
@ -42,6 +43,7 @@ Pierre Gayvallet <pierre.gayvallet@docker.com> <pierre.gayvallet@gmail.com>
Radu Matei <matei.radu94@gmail.com> Radu Matei <matei.radu94@gmail.com>
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@berkeley.edu> Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@berkeley.edu>
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@gmail.com> Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@gmail.com>
Robin Winkelewski <w9ncontact@gmail.com>
Rolf Neugebauer <rolf.neugebauer@docker.com> <rneugeba@users.noreply.github.com> Rolf Neugebauer <rolf.neugebauer@docker.com> <rneugeba@users.noreply.github.com>
Rolf Neugebauer <rolf.neugebauer@docker.com> <rn@users.noreply.github.com> Rolf Neugebauer <rolf.neugebauer@docker.com> <rn@users.noreply.github.com>
Rolf Neugebauer <rolf.neugebauer@docker.com> <rolf.neugebauer@gmail.com> Rolf Neugebauer <rolf.neugebauer@docker.com> <rolf.neugebauer@gmail.com>

5
AUTHORS
View File

@ -4,6 +4,7 @@
Ajeet Singh Raina, Docker Captain, {Code} Catalysts, Dell EMC R&D <ajeetraina@gmail.com> Ajeet Singh Raina, Docker Captain, {Code} Catalysts, Dell EMC R&D <ajeetraina@gmail.com>
Akihiro Suda <suda.akihiro@lab.ntt.co.jp> Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Alex Johnson <hello@alex-johnson.net> Alex Johnson <hello@alex-johnson.net>
Alice Frosi <alice@linux.vnet.ibm.com>
Amir Chaudhry <amir.chaudhry@docker.com> Amir Chaudhry <amir.chaudhry@docker.com>
Anil Madhavapeddy <anil.madhavapeddy@docker.com> Anil Madhavapeddy <anil.madhavapeddy@docker.com>
Avi Deitcher <avi@deitcher.net> Avi Deitcher <avi@deitcher.net>
@ -28,6 +29,8 @@ Edward Vielmetti <edward.vielmetti@gmail.com>
Emily Casey <ecasey@pivotal.io> Emily Casey <ecasey@pivotal.io>
Eric Briand <eric.briand@gmail.com> Eric Briand <eric.briand@gmail.com>
French Ben <frenchben@docker.com> French Ben <frenchben@docker.com>
functor <meehow@gmail.com>
Garth Bushell <garth.bushell@oracle.com>
George Papanikolaou <g3orge.app@gmail.com> George Papanikolaou <g3orge.app@gmail.com>
Gianluca Arbezzano <gianarb92@gmail.com> Gianluca Arbezzano <gianarb92@gmail.com>
Guillaume Rose <guillaume.rose@docker.com> Guillaume Rose <guillaume.rose@docker.com>
@ -68,6 +71,7 @@ Nathan LeClaire <nathan.leclaire@docker.com>
Nick Jones <nick@dischord.org> Nick Jones <nick@dischord.org>
Niclas Mietz <niclas@mietz.io> Niclas Mietz <niclas@mietz.io>
Nico Di Rocco <dirocco.nico@gmail.com> Nico Di Rocco <dirocco.nico@gmail.com>
Olaf Bergner <olaf.bergner@gmx.de>
Olaf Flebbe <of@oflebbe.de> Olaf Flebbe <of@oflebbe.de>
Phil Estes <estesp@linux.vnet.ibm.com> Phil Estes <estesp@linux.vnet.ibm.com>
Pierre Gayvallet <pierre.gayvallet@docker.com> Pierre Gayvallet <pierre.gayvallet@docker.com>
@ -98,6 +102,5 @@ Tim Potter <tpot@hpe.com>
Tobias Klauser <tklauser@distanz.ch> Tobias Klauser <tklauser@distanz.ch>
Tycho Andersen <tycho@docker.com> Tycho Andersen <tycho@docker.com>
Vincent Demeester <Vincent.Demeester@docker.com> Vincent Demeester <Vincent.Demeester@docker.com>
w9n <w9ncontact@gmail.com>
Zachery Hostens <zacheryph@gmail.com> Zachery Hostens <zacheryph@gmail.com>
zlim <zlim.lnx@gmail.com> zlim <zlim.lnx@gmail.com>