Update AUTHORS and mailmap

thaJeztah · thaJeztah · commit 2467cb4eda50 · 2019-04-27T16:50:47.000-07:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/.mailmap b/.mailmap
@@ -433,6 +433,8 @@ Stefan Berger <stefanb@linux.vnet.ibm.com>
 Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@us.ibm.com>
 Stefan J. Wernli <swernli@microsoft.com> <swernli@ntdev.microsoft.com>
 Stefan S. <tronicum@user.github.com>
+Stefan Scherer <stefan.scherer@docker.com>
+Stefan Scherer <stefan.scherer@docker.com> <scherer_stefan@icloud.com>
 Stephan Spindler <shutefan@gmail.com> <shutefan@users.noreply.github.com>
 Stephen Day <stephen.day@docker.com>
 Stephen Day <stephen.day@docker.com> <stevvooe@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
@@ -4,6 +4,7 @@
 Aanand Prasad <aanand.prasad@gmail.com>
 Aaron Davidson <aaron@databricks.com>
 Aaron Feng <aaron.feng@gmail.com>
+Aaron Hnatiw <aaron@griddio.com>
 Aaron Huslage <huslage@gmail.com>
 Aaron L. Xu <liker.xu@foxmail.com>
 Aaron Lehmann <aaron.lehmann@docker.com>
@@ -1154,6 +1155,7 @@ Luca-Bogdan Grigorescu <Luca-Bogdan Grigorescu>
 Lucas Chan <lucas-github@lucaschan.com>
 Lucas Chi <lucas@teacherspayteachers.com>
 Lucas Molas <lmolas@fundacionsadosky.org.ar>
+Lucas Silvestre <lukas.silvestre@gmail.com>
 Luciano Mores <leslau@gmail.com>
 Luis Martínez de Bartolomé Izquierdo <lmartinez@biicode.com>
 Luiz Svoboda <luizek@gmail.com>
@@ -1753,7 +1755,7 @@ Stefan Berger <stefanb@linux.vnet.ibm.com>
 Stefan J. Wernli <swernli@microsoft.com>
 Stefan Praszalowicz <stefan@greplin.com>
 Stefan S. <tronicum@user.github.com>
-Stefan Scherer <scherer_stefan@icloud.com>
+Stefan Scherer <stefan.scherer@docker.com>
 Stefan Staudenmeyer <doerte@instana.com>
 Stefan Weil <sw@weilnetz.de>
 Stephan Spindler <shutefan@gmail.com>

-Original file line number
+Diff line change
 Stefan Berger <[email protected]> <[email protected]>
 Stefan J. Wernli <[email protected]> <[email protected]>
 Stefan S. <[email protected]>
 +Stefan Scherer <[email protected]>
 +Stefan Scherer <[email protected]> <[email protected]>
 Stephan Spindler <[email protected]> <[email protected]>
 Stephen Day <[email protected]>
 Stephen Day <[email protected]> <[email protected]>
-Original file line number
+Diff line change
 Aanand Prasad <[email protected]>
 Aaron Davidson <[email protected]>
 Aaron Feng <[email protected]>
 +Aaron Hnatiw <[email protected]>
 Aaron Huslage <[email protected]>
 Aaron L. Xu <[email protected]>
 Aaron Lehmann <[email protected]>
 Lucas Chan <[email protected]>
 Lucas Chi <[email protected]>
 Lucas Molas <[email protected]>
 +Lucas Silvestre <[email protected]>
 Luciano Mores <[email protected]>
 Luis Martínez de Bartolomé Izquierdo <[email protected]>
 Luiz Svoboda <[email protected]>
 Stefan J. Wernli <[email protected]>
 Stefan Praszalowicz <[email protected]>
 Stefan S. <[email protected]>
 -Stefan Scherer <scherer_stefan@icloud.com>
 +Stefan Scherer <stefan.scherer@docker.com>
 Stefan Staudenmeyer <[email protected]>
 Stefan Weil <[email protected]>
 Stephan Spindler <[email protected]>