From fa166bd446b566509d83696ed11784ffed4c2a36 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 27 Feb 2017 16:18:13 -0500 Subject: [PATCH 1/2] .mailmap: Update from master Signed-off-by: Jeff Squyres (manually cherry picked from commits afc49f3361afe7d9bfeaddf489892c062eff7fc2 and e6b3be8e1f6fe50d4f1910df69f128b9ab14e083) --- .mailmap | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index c296874e490..12fb6064507 100644 --- a/.mailmap +++ b/.mailmap @@ -60,6 +60,7 @@ Yohann Burette Yohann Burette MPI Team (bot) +MPI Team (bot) MPI Team (bot) Yossi Itigin @@ -98,7 +99,11 @@ Annapurna Dasari L. R. Rajeshnarayanan -Aurélien Bouteiller -Aurélien Bouteiller +Aurelien Bouteiller +Aurelien Bouteiller Alex Mikheev + +Thomas Naughton + +Geoffrey Paulsen From 61a988dda0d577f61a52b75d874756b65bd09c9c Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 27 Feb 2017 16:43:32 -0500 Subject: [PATCH 2/2] AUTHORS: Re-run contrib/dist/make-authors.pl Signed-off-by: Jeff Squyres --- AUTHORS | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index b586c9cacf4..f7d8a09d18e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,8 +12,8 @@ individual who committed them. Abhishek Kulkarni, Indiana University adkulkar@cs.indiana.edu -Aboorva Devarajan - abodevar@in.ibm.com, IBM +Aboorva Devarajan, IBM + abodevar@in.ibm.com Adrian Knoth, Friedrich-Schiller-Universitat Jena adi@minet.uni-jena.de Adrian Reber, Hochschule Esslingen @@ -39,7 +39,7 @@ Anya Tatashina, Sun anya.tatashina@sun.com Artem Polyakov, Individual, Mellanox artpol84@gmail.com -Aurélien Bouteiller, University of Tennessee-Knoxville +Aurelien Bouteiller, University of Tennessee-Knoxville bouteill@icl.utk.edu Avneesh Pant, QLogic avneesh.pant@qlogic.com @@ -96,7 +96,7 @@ Eugene Loh, Sun, Oracle Francois WELLENREITER, Individual francois.wellenreiter@atos.net wellen@free.fr -Gabriel Pichot +Gabriel Pichot, Individual gabriel.pichot@gmail.com Galen Shipman, Los Alamos National Laboratory gshipman@lanl.gov @@ -146,7 +146,7 @@ Jose Roman, Universitat Politecnica de Valencia Josh Hursey, Indiana University, Oak Ridge National Laboratory, Los Alamos National Laboratory, Lawrence Berkeley National Laboratory, University of Wisconsin-La Crosse, IBM jhursey@us.ibm.com jjhursey@open-mpi.org -Joshua Gerrard +Joshua Gerrard, Individual enquiries@joshuagerrard.com joshuagerrard+ompi-commit@protonmail.com Joshua Ladd, Mellanox @@ -178,6 +178,8 @@ Mangala Jyothi Bhaskar, University of Houston mjbhaskar@uh.edu Manjunath Gorentla Venkata, Oak Ridge National Laboratory manjugv@ornl.gov +Mark Allen, IBM + markalle@us.ibm.com Mark Santcroos, Rutgers University mas781@scarletmail.rutgers.edu Mark Taylor, Los Alamos National Laboratory @@ -253,6 +255,8 @@ Ron Brightwell, Sandia National Laboratory Ryan Grant, Sandia National Laboratory regrant233@gmail.com regrant@sandia.gov +Sameh S. Sharkawi, IBM + sssharka@us.ibm.com Sami Ayyorgun, Los Alamos National Laboratory sami@lanl.gov Samuel Gutierrez, Los Alamos National Laboratory @@ -285,6 +289,8 @@ Thara Angskun, University of Tennessee-Knoxville angskun@cs.utk.edu Thomas Herault, University of Tennessee-Knoxville herault@icl.utk.edu +Thomas Naughton, Oak Ridge National Laboratory + naughtont@ornl.gov Tim Mattox, Indiana University, Cisco, Individual tmattox@gmail.com Tim Prins, Indiana University, Los Alamos National Laboratory @@ -294,8 +300,6 @@ Tim Woodall, Los Alamos National Laboratory Todd Kordenbrock, Sandia National Laboratory thkgcode@gmail.com thkorde@sandia.gov -Tom Naughton, Oak Ridge National Laboratory - naughtont@ornl.gov Tomislav Janjusic, Mellanox tomislavj@mngx-apl-01.mtl.labs.mlnx Torsten Hoefler, Indiana University, Technische Universtaet Chemnitz