From 6cea1e3c9854369b340472cb274152e7023eb542 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 19 Dec 2014 22:15:27 +0100 Subject: [PATCH 1/8] mailmap: Yunchuan Wen affiliation Signed-off-by: Yann Dupont --- .organizationmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.organizationmap b/.organizationmap index 1bcb817ad36..41a475363e1 100644 --- a/.organizationmap +++ b/.organizationmap @@ -212,6 +212,7 @@ The Linux Box Casey Bodley The Linux Box Matt Benjamin The University of Arizona James Ryan Cresawn Ubuntu Kylin Li Wang +Ubuntu Kylin Yunchuan Wen Unaffiliated Yongyue Sun Unaffiliated Accela Zhao Unaffiliated Ailing Zhang From 977db4fe864b6a9116f60d18d793c7f10bff3312 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 19 Dec 2014 22:31:33 +0100 Subject: [PATCH 2/8] mailmap: Matt Benjamin affiliation Signed-off-by: Yann Dupont --- .organizationmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.organizationmap b/.organizationmap index 41a475363e1..cb55c80acbc 100644 --- a/.organizationmap +++ b/.organizationmap @@ -44,6 +44,7 @@ Cloudwatt Christophe Courtaut Florent Flament Cloudwatt Loic Dachary Cloudwatt Sahid Orentino Ferdjaoui +CohortFS, LLC Matt Benjamin Commerce Guys Nikola Kotur Corvisa LLC Walter Huf Credit Mutuel Arkea Eric Mourgaya From eb659ce61a3ff1b6a3bff0a192b5f5ef62b3b123 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 19 Dec 2014 23:22:32 +0100 Subject: [PATCH 3/8] mailmap: David Anderson affiliation Signed-off-by: Yann Dupont --- .organizationmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.organizationmap b/.organizationmap index cb55c80acbc..e00fb3b44eb 100644 --- a/.organizationmap +++ b/.organizationmap @@ -222,6 +222,7 @@ Unaffiliated Cheng Cheng Unaffiliated Daniel Schepler Unaffiliated Colin Mattson Unaffiliated Dan Chai +Unaffiliated David Anderson Unaffiliated Ding Dinghua Unaffiliated Dominik Hannen Unaffiliated Dongmao Zhang From 9636dfca37fea16c50907305aeb079dfce32f08e Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 19 Dec 2014 23:25:12 +0100 Subject: [PATCH 4/8] mailmap: Shishir Gowda affiliation Signed-off-by: Yann Dupont --- .organizationmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.organizationmap b/.organizationmap index e00fb3b44eb..855ef12ecac 100644 --- a/.organizationmap +++ b/.organizationmap @@ -192,6 +192,7 @@ SanDisk Anand Bhat SanDisk Pavan Rallabhandi SanDisk Somnath Roy SanDisk Sushma Gurram +SanDisk Shishir Gowda Science & Technology Facilities Council George Ryall SendFaster Christopher O'Connell Spectra Logic Alan Somers From a8542d0e11cd94d65ad012d7548981200e680f1a Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 19 Dec 2014 23:31:56 +0100 Subject: [PATCH 5/8] mailmap: Ning Yao affiliation Signed-off-by: Yann Dupont --- .organizationmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.organizationmap b/.organizationmap index 855ef12ecac..eaf74f50eef 100644 --- a/.organizationmap +++ b/.organizationmap @@ -243,6 +243,7 @@ Unaffiliated Mehdi Abaakouk Unaffiliated Michal Jarzabek Unaffiliated Michael Nelson Unaffiliated Michael Riederer +Unaffiliated Ning Yao Unaffiliated (no author) <(no author)@29311d96-e01e-0410-9327-a35deaab8ce9> Unaffiliated Roman Haritonov Unaffiliated Shawn Edwards From f3fd07cb23d5ee8e06640dd8e65b462f57ed1da9 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 19 Dec 2014 23:35:10 +0100 Subject: [PATCH 6/8] mailmap: Christos Stavrakakis affiliation Signed-off-by: Yann Dupont --- .organizationmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.organizationmap b/.organizationmap index eaf74f50eef..3872b91cb39 100644 --- a/.organizationmap +++ b/.organizationmap @@ -220,6 +220,7 @@ Unaffiliated Accela Zhao Unaffiliated Ailing Zhang Unaffiliated BJ Lougee Unaffiliated Cheng Cheng +Unaffiliated Christos Stavrakakis Unaffiliated Daniel Schepler Unaffiliated Colin Mattson Unaffiliated Dan Chai From bb09b20e53d078f935964378507655d315216496 Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Sat, 20 Dec 2014 00:18:39 +0100 Subject: [PATCH 7/8] mailmap: Alfredo Deza affiliation : Fix Typo. Signed-off-by: Yann Dupont --- .peoplemap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.peoplemap b/.peoplemap index 5406afbc67c..e80af2ef9e5 100644 --- a/.peoplemap +++ b/.peoplemap @@ -16,7 +16,7 @@ # git log --pretty='%aN <%aE>' $range | git -c mailmap.file=.peoplemap check-mailmap --stdin | sort | uniq | sed -e 's/\(.*\) \(<.*\)/\2 \1/' | uniq --skip-field=1 --all-repeated | sed -e 's/\(.*>\) \(.*\)/\2 \1/' # Alexandre Marangone Alexandre Marangone -Alfredo Deza Alfreda Deza +Alfredo Deza Alfredo Deza Dan Mick Dan Mick David Zafman David Zafman Greg Farnum Greg Farnum From 4193594cff4ba4a11eff5a26c4debef11cd8a39f Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Fri, 19 Dec 2014 23:28:33 +0100 Subject: [PATCH 8/8] mailmap: Chris Holcombe affiliation --- .mailmap | 1 + .organizationmap | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index ccd188f2a87..fe6dd406dc8 100644 --- a/.mailmap +++ b/.mailmap @@ -28,6 +28,7 @@ Carlos Maltzahn carlosm Chendi Xue Chendi Xue Chendi.Xue Cheng Cheng cchengleo +Chris Holcombe cholcombe973 Christian Brunner Christian Marie Christophe Courtaut Kri5 diff --git a/.organizationmap b/.organizationmap index 3872b91cb39..3b18e853d73 100644 --- a/.organizationmap +++ b/.organizationmap @@ -136,6 +136,7 @@ Lebanon Evangelical School Jonathan Dieter Esteban Molina-Estolano Mirantis Andrew Woodward MIT Computer Science and Artificial Intelligence Laboratory Stephen Jahl +Nebula Chris Holcombe Opower Derrick Schneider Pacific Northwest National Laboratory Brown, David M JR Pacific Northwest National Laboratory Erwin, Brock A