From 1b6a85626ef46ab1525fac9fd6ab65cdd65c3350 Mon Sep 17 00:00:00 2001 From: Peter Waller Date: Wed, 30 Jul 2014 14:13:13 +0100 Subject: [PATCH 1/4] Run hack/generate-authors.sh Docker-DCO-1.1-Signed-off-by: Peter Waller (github: pwaller) Upstream-commit: 7d78dc33b15c9c5fd4cc2c0c5526cdfd5505ee4f Component: engine --- components/engine/AUTHORS | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/components/engine/AUTHORS b/components/engine/AUTHORS index 38f2f38c2a..c17120cec5 100644 --- a/components/engine/AUTHORS +++ b/components/engine/AUTHORS @@ -38,6 +38,7 @@ Andrew Macgregor Andrew Munsell Andrews Medina Andrew Weiss +Andrew Weiss Andrew Williams Andy Chambers andy diller @@ -142,6 +143,7 @@ David Röthlisberger David Sissitka Deni Bertovic Derek +Deric Crago Dinesh Subhraveti Djibril Koné dkumor @@ -178,6 +180,7 @@ Fabio Rehm Fabrizio Regini Faiz Khan Fareed Dudhia +fcarriedo Felix Rabe Fernando Flavio Castelli @@ -289,6 +292,7 @@ Josh Josh Poimboeuf JP Julien Barbier +Julien Bordellier Julien Bordellier Julien Dubois Justin Force @@ -312,6 +316,7 @@ kim0 Kim BKC Carlbacker Kimbro Staken Kiran Gangadharan +knappe Kohei Tsuruta Konstantin Pelykh Kyle Conroy @@ -370,6 +375,7 @@ Michael Neale Michaël Pailloncy Michael Prokop Michael Stapelberg +Michiel@unhosted Miguel Angel Fernández Mike Chelen Mike Gaffney @@ -418,11 +424,13 @@ Peter Braden Peter Waller Phillip Alexander Phil Spitler +Phil Piergiuliano Bossi Pierre-Alain RIVIERE Piotr Bogdan pysqz Quentin Brossard +r0n22 Rafal Jeczalik Rajat Pandit Ralph Bean @@ -465,6 +473,8 @@ Scott Bessler Scott Collier Sean Cronin Sean P. Kane +Sebastiaan van Stijn +Sébastien Luttringer Sébastien Sébastien Stormacq Senthil Kumar Selvaraj @@ -489,7 +499,7 @@ Steeve Morin Stefan Praszalowicz Steven Burgess sudosurootdev -Sven Dowideit +Sven Dowideit Sylvain Bellemare tang0th Tatsuki Sugiura From ab4c9735dea36d1c9aa3399723e4055b862452fe Mon Sep 17 00:00:00 2001 From: Peter Waller Date: Wed, 30 Jul 2014 14:13:43 +0100 Subject: [PATCH 2/4] Change Peter Waller's canonical e-mail address Docker-DCO-1.1-Signed-off-by: Peter Waller (github: pwaller) Upstream-commit: d687c5b3393a22e0db6473f0572a332f211c7102 Component: engine --- components/engine/.mailmap | 1 + components/engine/AUTHORS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/engine/.mailmap b/components/engine/.mailmap index bd6360a2af..7919eed502 100644 --- a/components/engine/.mailmap +++ b/components/engine/.mailmap @@ -93,3 +93,4 @@ Nathan LeClaire Matthew Heon + diff --git a/components/engine/AUTHORS b/components/engine/AUTHORS index c17120cec5..6f88355e18 100644 --- a/components/engine/AUTHORS +++ b/components/engine/AUTHORS @@ -421,7 +421,7 @@ Paul Nasrat Paul Paul Weaver Peter Braden -Peter Waller +Peter Waller Phillip Alexander Phil Spitler Phil From 56a4d87cf40d63120e0046c1ccbda7fcf014e851 Mon Sep 17 00:00:00 2001 From: Peter Waller Date: Wed, 30 Jul 2014 14:22:15 +0100 Subject: [PATCH 3/4] Add a few canonicalized author names Docker-DCO-1.1-Signed-off-by: Peter Waller (github: pwaller) Upstream-commit: f8f36ff320d5b14a5fb61ab3fec0b1e7ef1e8aa6 Component: engine --- components/engine/.mailmap | 3 +++ components/engine/AUTHORS | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/.mailmap b/components/engine/.mailmap index 7919eed502..c9c6d3f94f 100644 --- a/components/engine/.mailmap +++ b/components/engine/.mailmap @@ -94,3 +94,6 @@ Nathan LeClaire Matthew Heon + +Francisco Carriedo + diff --git a/components/engine/AUTHORS b/components/engine/AUTHORS index 6f88355e18..6c16a3459a 100644 --- a/components/engine/AUTHORS +++ b/components/engine/AUTHORS @@ -37,7 +37,6 @@ Andrew France Andrew Macgregor Andrew Munsell Andrews Medina -Andrew Weiss Andrew Weiss Andrew Williams Andy Chambers @@ -180,7 +179,6 @@ Fabio Rehm Fabrizio Regini Faiz Khan Fareed Dudhia -fcarriedo Felix Rabe Fernando Flavio Castelli @@ -292,7 +290,6 @@ Josh Josh Poimboeuf JP Julien Barbier -Julien Bordellier Julien Bordellier Julien Dubois Justin Force From 024c2cf99d8f07fd26ad18934f4fe200b0aee759 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 7 Aug 2014 15:30:10 -0600 Subject: [PATCH 4/4] Regenerate AUTHORS one more time Signed-off-by: Andrew Page Upstream-commit: 7a34f1343372b0712155087a9a5f447b59b60084 Component: engine --- components/engine/AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/AUTHORS b/components/engine/AUTHORS index 6c16a3459a..993f19b713 100644 --- a/components/engine/AUTHORS +++ b/components/engine/AUTHORS @@ -496,7 +496,7 @@ Steeve Morin Stefan Praszalowicz Steven Burgess sudosurootdev -Sven Dowideit +Sven Dowideit Sylvain Bellemare tang0th Tatsuki Sugiura