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

Add a few more aliases to .mailmap and re-generated AUTORS

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-05-23 12:13:11 +01:00
parent bd7148856a
commit 772370fb2c
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.mailmap
View File

@ -6,22 +6,30 @@
# #
# For explanation on this file format: man git-shortlog # For explanation on this file format: man git-shortlog
Amir Chaudhry <amir.chaudhry@docker.com> <amirmc@gmail.com>
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>
Dan Finneran <dan@thebsdbox.co.uk> <daniel.finneran@gmail.com> Dan Finneran <dan@thebsdbox.co.uk> <daniel.finneran@gmail.com>
Dave Scott <dave.scott@docker.com> <dave.scott@unikernel.com> Dave Scott <dave.scott@docker.com> <dave.scott@unikernel.com>
Dave Scott <dave.scott@docker.com> <dave@recoil.org> Dave Scott <dave.scott@docker.com> <dave@recoil.org>
Dave Scott <dave.scott@docker.com> <djs55@users.noreply.github.com> Dave Scott <dave.scott@docker.com> <djs55@users.noreply.github.com>
David Gageot <david.gageot@docker.com> <david@gageot.net>
David Sheets <david.sheets@docker.com> <dsheets@docker.com> David Sheets <david.sheets@docker.com> <dsheets@docker.com>
David Sheets <david.sheets@docker.com> <sheets@alum.mit.edu> David Sheets <david.sheets@docker.com> <sheets@alum.mit.edu>
Ian Campbell <ian.campbell@docker.com> <ijc25@users.noreply.github.com> Ian Campbell <ian.campbell@docker.com> <ijc25@users.noreply.github.com>
Jeremy Yallop <yallop@docker.com> <yallop@gmail.com> Jeremy Yallop <yallop@docker.com> <yallop@gmail.com>
Justin Cormack <justin.cormack@docker.com> <justin.cormack@unikernel.com> Justin Cormack <justin.cormack@docker.com> <justin.cormack@unikernel.com>
Justin Cormack <justin.cormack@docker.com> <justin@specialbusservice.com> Justin Cormack <justin.cormack@docker.com> <justin@specialbusservice.com>
Ken Cochrane <ken.cochrane@docker.com> <KenCochrane@gmail.com>
Magnus Skjegstad <magnus.skjegstad@docker.com> <magnus@skjegstad.com>
Mindy Preston <mindy.preston@docker.com> <meetup@yomimono.org> Mindy Preston <mindy.preston@docker.com> <meetup@yomimono.org>
Nathan LeClaire <nathan.leclaire@gmail.com> <nathanleclaire@gmail.com> Nathan LeClaire <nathan.leclaire@docker.com> <nathan.leclaire@gmail.com>
Nathan LeClaire <nathan.leclaire@docker.com> <nathanleclaire@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>
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> <rolf.neugebauer@gmail.com> Rolf Neugebauer <rolf.neugebauer@docker.com> <rolf.neugebauer@gmail.com>
Sebastiaan van Stijn <sebastiaan.vanstijn@docker.com> <github@gone.nl>
Simon Ferquel <simon.ferquel@docker.com> <simon.ferquel@hotmail.fr> Simon Ferquel <simon.ferquel@docker.com> <simon.ferquel@hotmail.fr>
Thomas Gazagnaire <thomas@gazagnaire.org> <thomas@gazagnaire.com> Thomas Gazagnaire <thomas.gazagnaire@docker.com> <thomas@gazagnaire.com>
Thomas Gazagnaire <thomas.gazagnaire@docker.com> <thomas@gazagnaire.org>

17
AUTHORS
View File

@ -2,15 +2,16 @@
# For how it is generated, see `scripts/generate-authors.sh`. # For how it is generated, see `scripts/generate-authors.sh`.
Akihiro Suda <suda.akihiro@lab.ntt.co.jp> Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Amir Chaudhry <amirmc@gmail.com> Amir Chaudhry <amir.chaudhry@docker.com>
Anil Madhavapeddy <anil@recoil.org> Anil Madhavapeddy <anil.madhavapeddy@docker.com>
Avi Deitcher <avi@deitcher.net> Avi Deitcher <avi@deitcher.net>
Carlton-Semple <carlton.semple@ibm.com> Carlton-Semple <carlton.semple@ibm.com>
Dan Finneran <dan@thebsdbox.co.uk> Dan Finneran <dan@thebsdbox.co.uk>
Daniel Hiltgen <daniel.hiltgen@docker.com> Daniel Hiltgen <daniel.hiltgen@docker.com>
Dave Scott <dave.scott@docker.com> Dave Scott <dave.scott@docker.com>
Dave Tucker <dt@docker.com> Dave Tucker <dt@docker.com>
David Gageot <david@gageot.net> David Gageot <david.gageot@docker.com>
David Scott <dave.scott@docker.com>
David Sheets <david.sheets@docker.com> David Sheets <david.sheets@docker.com>
Dieter Reuter <dieter.reuter@me.com> Dieter Reuter <dieter.reuter@me.com>
French Ben <frenchben@docker.com> French Ben <frenchben@docker.com>
@ -24,27 +25,27 @@ Jesse Adametz <jesseadametz@gmail.com>
John Albietz <inthecloud247@gmail.com> John Albietz <inthecloud247@gmail.com>
Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com> Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Justin Cormack <justin.cormack@docker.com> Justin Cormack <justin.cormack@docker.com>
Ken Cochrane <KenCochrane@gmail.com> Ken Cochrane <ken.cochrane@docker.com>
Lorenzo Fontana <lo@linux.com> Lorenzo Fontana <lo@linux.com>
Madhu Venugopal <madhu@docker.com> Madhu Venugopal <madhu@docker.com>
Magnus Skjegstad <magnus@skjegstad.com> Magnus Skjegstad <magnus.skjegstad@docker.com>
Matt Bajor <matt.bajor@workday.com> Matt Bajor <matt.bajor@workday.com>
Michel Courtine <michel.courtine@docker.com> Michel Courtine <michel.courtine@docker.com>
Mickaël Salaün <mic@digikod.net> Mickaël Salaün <mic@digikod.net>
Mindy Preston <mindy.preston@docker.com> Mindy Preston <mindy.preston@docker.com>
Natanael Copa <natanael.copa@docker.com> Natanael Copa <natanael.copa@docker.com>
Nathan Dautenhahn <ndd@seas.upenn.edu> Nathan Dautenhahn <ndd@seas.upenn.edu>
Nathan LeClaire <nathan.leclaire@gmail.com> Nathan LeClaire <nathan.leclaire@docker.com>
Phil Estes <estesp@linux.vnet.ibm.com> Phil Estes <estesp@linux.vnet.ibm.com>
Richard Mortier <mort@cantab.net> Richard Mortier <mort@cantab.net>
Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Robb Kistler <robb.kistler@docker.com> Robb Kistler <robb.kistler@docker.com>
Rolf Neugebauer <rolf.neugebauer@docker.com> Rolf Neugebauer <rolf.neugebauer@docker.com>
Sebastiaan van Stijn <github@gone.nl> Sebastiaan van Stijn <sebastiaan.vanstijn@docker.com>
Simon Ferquel <simon.ferquel@docker.com> Simon Ferquel <simon.ferquel@docker.com>
solidnerd <niclas@mietz.io> solidnerd <niclas@mietz.io>
Theo Koulouris <theo.koulouris@hpe.com> Theo Koulouris <theo.koulouris@hpe.com>
Thomas Gazagnaire <thomas@gazagnaire.org> Thomas Gazagnaire <thomas.gazagnaire@docker.com>
Thomas Shaw <tomwillfixit@users.noreply.github.com> Thomas Shaw <tomwillfixit@users.noreply.github.com>
Tiago Pires <tandrepires@gmail.com> Tiago Pires <tandrepires@gmail.com>
Tycho Andersen <tycho@docker.com> Tycho Andersen <tycho@docker.com>