update authors and mailmap

thaJeztah · thaJeztah · commit 3df990de70e9 · 2022-04-02T11:25:11.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/.mailmap b/.mailmap
@@ -1 +1,10 @@
-Stephen J Day <stephen.day@docker.com>  Stephen Day <stevvooe@users.noreply.github.com>
+Aaron Lehmann <alehmann@netflix.com> <aaron.lehmann@docker.com>
+Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> <suda.akihiro@lab.ntt.co.jp>
+Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> <suda.kyoto@gmail.com>
+Derek McGowan <derek@mcg.dev> <derek@mcgstyle.net>
+Michael Crosby <crosbymichael@gmail.com> <michael@thepasture.io>
+Phil Estes <estesp@gmail.com> <estesp@linux.vnet.ibm.com>
+Phil Estes <estesp@gmail.com> <estesp@amazon.com>
+Stephen J Day <stevvooe@gmail.com> <stephen.day@getcruise.com>
+Stephen J Day <stevvooe@gmail.com> <stevvooe@users.noreply.github.com>
+Stephen J Day <stevvooe@gmail.com> <stephen.day@docker.com>
diff --git a/AUTHORS b/AUTHORS
@@ -1,39 +1,35 @@
-Aaron Lehmann <aaron.lehmann@docker.com>
+Aaron Lehmann <alehmann@netflix.com>
 Akash Gupta <akagup@microsoft.com>
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
-Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
-Akihiro Suda <suda.kyoto@gmail.com>
 Andrew Pennebaker <apennebaker@datapipe.com>
 Brandon Philips <brandon.philips@coreos.com>
 Brian Goff <cpuguy83@gmail.com>
 Christopher Jones <tophj@linux.vnet.ibm.com>
 Daniel, Dao Quang Minh <dqminh89@gmail.com>
 Darren Stahl <darst@microsoft.com>
 Derek McGowan <derek@mcg.dev>
-Derek McGowan <derek@mcgstyle.net>
 Edward Pilatowicz <edward.pilatowicz@oracle.com>
 Fu Wei <fuweid89@gmail.com>
+Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
 Hajime Tazaki <thehajime@gmail.com>
 Ian Campbell <ijc@docker.com>
 Ivan Markin <sw@nogoegst.net>
 Jacob Blain Christen <jacob@rancher.com>
 Justin Cormack <justin.cormack@docker.com>
 Justin Cummins <sul3n3t@gmail.com>
 Kasper Fabæch Brandt <poizan@poizan.dk>
+Kazuyoshi Kato <katokazu@amazon.com>
 Kir Kolyshkin <kolyshkin@gmail.com>
 Michael Crosby <crosbymichael@gmail.com>
-Michael Crosby <michael@thepasture.io>
 Michael Wan <zirenwan@gmail.com>
 Mike Brown <brownwm@us.ibm.com>
 Niels de Vos <ndevos@redhat.com>
-Phil Estes <estesp@amazon.com>
 Phil Estes <estesp@gmail.com>
-Phil Estes <estesp@linux.vnet.ibm.com>
 Sam Whited <sam@samwhited.com>
 Samuel Karp <me@samuelkarp.com>
 Sebastiaan van Stijn <github@gone.nl>
 Shengjing Zhu <zhsj@debian.org>
-Stephen J Day <stephen.day@docker.com>
+Stephen J Day <stevvooe@gmail.com>
 Tibor Vass <tibor@docker.com>
 Tobias Klauser <tklauser@distanz.ch>
 Tom Faulhaber <tffaulha@amazon.com>

-Original file line number
+Diff line change
@@ @@ -1 +1,10 @@ @@
 -Stephen J Day <[email protected]>  Stephen Day <[email protected]>
 +Aaron Lehmann <[email protected]> <[email protected]>
 +Akihiro Suda <[email protected]> <[email protected]>
 +Akihiro Suda <[email protected]> <[email protected]>
 +Derek McGowan <[email protected]> <[email protected]>
 +Michael Crosby <[email protected]> <[email protected]>
 +Phil Estes <[email protected]> <[email protected]>
 +Phil Estes <[email protected]> <[email protected]>
 +Stephen J Day <[email protected]> <[email protected]>
 +Stephen J Day <[email protected]> <[email protected]>
 +Stephen J Day <[email protected]> <[email protected]>
-Original file line number
+Diff line change
@@ @@ -1,39 +1,35 @@ @@
 -Aaron Lehmann <aaron.lehmann@docker.com>
 +Aaron Lehmann <alehmann@netflix.com>
 Akash Gupta <[email protected]>
 Akihiro Suda <[email protected]>
 -Akihiro Suda <[email protected]>
 -Akihiro Suda <[email protected]>
 Andrew Pennebaker <[email protected]>
 Brandon Philips <[email protected]>
 Brian Goff <[email protected]>
 Christopher Jones <[email protected]>
 Daniel, Dao Quang Minh <[email protected]>
 Darren Stahl <[email protected]>
 Derek McGowan <[email protected]>
 -Derek McGowan <[email protected]>
 Edward Pilatowicz <[email protected]>
 Fu Wei <[email protected]>
 +Gabriel Adrian Samfira <[email protected]>
 Hajime Tazaki <[email protected]>
 Ian Campbell <[email protected]>
 Ivan Markin <[email protected]>
 Jacob Blain Christen <[email protected]>
 Justin Cormack <[email protected]>
 Justin Cummins <[email protected]>
 Kasper Fabæch Brandt <[email protected]>
 +Kazuyoshi Kato <[email protected]>
 Kir Kolyshkin <[email protected]>
 Michael Crosby <[email protected]>
 -Michael Crosby <[email protected]>
 Michael Wan <[email protected]>
 Mike Brown <[email protected]>
 Niels de Vos <[email protected]>
 -Phil Estes <[email protected]>
 Phil Estes <[email protected]>
 -Phil Estes <[email protected]>
 Sam Whited <[email protected]>
 Samuel Karp <[email protected]>
 Sebastiaan van Stijn <[email protected]>
 Shengjing Zhu <[email protected]>
 -Stephen J Day <stephen.day@docker.com>
 +Stephen J Day <stevvooe@gmail.com>
 Tibor Vass <[email protected]>
 Tobias Klauser <[email protected]>
 Tom Faulhaber <[email protected]>