From b81acd7c4ef6f7a8ae09a3580ff19c906dc33f80 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 1 Dec 2022 10:04:48 +0100 Subject: [PATCH 1/2] Update mailmap and AUTHORS Signed-off-by: Sebastiaan van Stijn --- .mailmap | 5 +++++ AUTHORS | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 8899e5f820..4efa4ffff9 100644 --- a/.mailmap +++ b/.mailmap @@ -6,6 +6,7 @@ # # For explanation on this file format: man git-shortlog + <1674195+squeegels@users.noreply.github.com> Aaron L. Xu Aaron Lehmann Aaron Lehmann @@ -32,6 +33,7 @@ Alexander Larsson Alexander Morozov Alexander Morozov Alexandre Beslic +Alexis Couvreur Alicia Lauerman Allen Sun Allen Sun @@ -380,6 +382,8 @@ Nathan LeClaire Nathan LeClaire Neil Horman Nick Russo +Nick Santos +Nick Santos Nicolas Borboën Nicolas De Loof Nigel Poulton @@ -446,6 +450,7 @@ Solomon Hykes Solomon Hykes Soshi Katsuta Soshi Katsuta +Spring Lee Sridhar Ratnakumar Sridhar Ratnakumar Srini Brahmaroutu diff --git a/AUTHORS b/AUTHORS index b7bf053217..eb6e24c8b6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,6 +24,7 @@ Akihiro Suda Akim Demaille Alan Thompson Albert Callarisa +Alberto Roura Albin Kerouanton Aleksa Sarai Aleksander Piotrowski @@ -37,6 +38,7 @@ Alexander Morozov Alexander Ryabov Alexandre González Alexey Igrychev +Alexis Couvreur Alfred Landrum Alicia Lauerman Allen Sun @@ -82,6 +84,7 @@ Bardia Keyoumarsi Barnaby Gray Bastiaan Bakker BastianHofmann +Ben Bodenmiller Ben Bonnefoy Ben Creasy Ben Firshman @@ -93,6 +96,7 @@ Bhumika Bayani Bill Wang Bin Liu Bingshen Wang +Bishal Das Boaz Shuster Bogdan Anton Boris Pruessmann @@ -105,6 +109,7 @@ Bret Fisher Brian (bex) Exelbierd Brian Goff Brian Wieder +Bruno Sousa Bryan Bess Bryan Boreham Bryan Murphy @@ -192,6 +197,7 @@ David Calavera David Cramer David Dooling David Gageot +David Karlsson David Lechner David Scott David Sheets @@ -251,6 +257,7 @@ Evelyn Xu Everett Toews Fabio Falci Fabrizio Soppelsa +Felix Geyer Felix Hupfeld Felix Rabe fezzik1620 @@ -275,6 +282,7 @@ George MacRorie George Xie Gianluca Borello Gildas Cuisinier +Gio d'Amelio Gleb Stsenov Goksu Toprak Gou Rao @@ -332,6 +340,7 @@ Jan-Jaap Driessen Jana Radhakrishnan Jared Hocutt Jasmine Hegman +Jason Hall Jason Heiss Jason Plum Jay Kamat @@ -501,6 +510,7 @@ Mason Fish Mason Malone Mateusz Major Mathieu Champlon +Mathieu Rollet Matt Gucci Matt Robenolt Matteo Orefice @@ -553,6 +563,7 @@ Moysés Borges Mozi <29089388+pzhlkj6612@users.noreply.github.com> Mrunal Patel muicoder +Murukesh Mohanan Muthukumar R Máximo Cuadros Mårten Cassel @@ -568,6 +579,7 @@ Nathan LeClaire Nathan McCauley Neil Peterson Nick Adcock +Nick Santos Nico Stapelbroek Nicola Kabar Nicolas Borboën @@ -666,6 +678,7 @@ Sainath Grandhi Sakeven Jiang Sally O'Malley Sam Neirinck +Sam Thibault Samarth Shah Sambuddha Basu Sami Tabet @@ -701,7 +714,8 @@ Slava Semushin Solomon Hykes Song Gao Spencer Brown -squeegels <1674195+squeegels@users.noreply.github.com> +Spring Lee +squeegels Srini Brahmaroutu Stefan S. Stefan Scherer From f2566760a847a047e81b9d6a3c5c21f5fba8d1da Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 1 Dec 2022 10:05:22 +0100 Subject: [PATCH 2/2] Update AUTHORS header to indicate it's generated Using both @generated, and using Go's format for generated files, to match the format we now use on moby/moby. Signed-off-by: Sebastiaan van Stijn --- AUTHORS | 5 +++-- scripts/docs/generate-authors.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index eb6e24c8b6..483743c992 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,6 @@ -# This file lists all individuals having contributed content to the repository. -# For how it is generated, see `scripts/docs/generate-authors.sh`. +# File @generated by scripts/docs/generate-authors.sh. DO NOT EDIT. +# This file lists all contributors to the repository. +# See scripts/docs/generate-authors.sh to make modifications. Aanand Prasad Aaron L. Xu diff --git a/scripts/docs/generate-authors.sh b/scripts/docs/generate-authors.sh index b76ef325eb..338172232f 100755 --- a/scripts/docs/generate-authors.sh +++ b/scripts/docs/generate-authors.sh @@ -5,8 +5,9 @@ set -e OUT="${1:-.}" { cat <<-'EOH' - # This file lists all individuals having contributed content to the repository. - # For how it is generated, see `scripts/docs/generate-authors.sh`. + # File @generated by scripts/docs/generate-authors.sh. DO NOT EDIT. + # This file lists all contributors to the repository. + # See scripts/docs/generate-authors.sh to make modifications. EOH echo git log --format='%aN <%aE>' | LC_ALL=C.UTF-8 sort -uf