diff options
author | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-21 12:38:43 +0200 |
---|---|---|
committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-21 12:38:43 +0200 |
commit | 213e3f0860ada9c1f7a5a945d95398c717bfb7aa (patch) | |
tree | b2559492525283e4de531989d4e9ce82d56ad0c4 /.mailmap | |
parent | dd56784d2861d866cc3b6e15a145331297d283f0 (diff) | |
parent | 8de143a99440d708e8e22bd63bcad25c483d8ffa (diff) | |
download | spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.tar.gz spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.tar.bz2 spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.tar.xz spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.zip |
Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase
Conflicts:
lib/spack/spack/cmd/install.py
lib/spack/spack/cmd/setup.py
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 76 |
1 files changed, 56 insertions, 20 deletions
@@ -1,20 +1,56 @@ -Todd Gamblin <tgamblin@llnl.gov> George Todd Gamblin <gamblin2@llnl.gov> -Todd Gamblin <tgamblin@llnl.gov> Todd Gamblin <gamblin2@llnl.gov> -Adam Moody <moody20@llnl.gov> Adam T. Moody <moody20@llnl.gov> -Alfredo Gimenez <gimenez1@llnl.gov> Alfredo Gimenez <alfredo.gimenez@gmail.com> -David Boehme <boehme3@llnl.gov> David Boehme <boehme3@sierra324.llnl.gov> -David Boehme <boehme3@llnl.gov> David Boehme <boehme3@sierra648.llnl.gov> -Kevin Brandstatter <kjbrandstatter@gmail.com> Kevin Brandstatter <kbrandst@hawk.iit.edu> -Luc Jaulmes <luc.jaulmes@bsc.es> Luc Jaulmes <jaulmes1@llnl.gov> -Saravan Pantham <saravan.pantham@gmail.com> Saravan Pantham <pantham1@surface86.llnl.gov> -Tom Scogland <tscogland@llnl.gov> Tom Scogland <scogland1@llnl.gov> -Tom Scogland <tscogland@llnl.gov> Tom Scogland <tom.scogland@gmail.com> -Joachim Protze <protze@rz.rwth-aachen.de> jprotze <protze@rz.rwth-aachen.de> -Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@surface86.llnl.gov> -Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@cab687.llnl.gov> -Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@cab690.llnl.gov> -Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@catalyst159.llnl.gov> -Gregory L. Lee <lee218@llnl.gov> Gregory Lee <lee218@llnl.gov> -Massimiliano Culpo <massimiliano.culpo@epfl.ch> Massimiliano Culpo <massimiliano.culpo@googlemail.com> -Massimiliano Culpo <massimiliano.culpo@epfl.ch> alalazo <massimiliano.culpo@googlemail.com> -Mark Miller <miller86@llnl.gov> miller86 <miller86@llnl.gov> +Abhinav Bhatele <bhatele@llnl.gov> Abhinav Bhatele <bhatele@gmail.com> +Adam Moody <moody20@llnl.gov> Adam T. Moody <moody20@llnl.gov> +Alfredo Gimenez <gimenez1@llnl.gov> Alfredo Gimenez <alfredo.gimenez@gmail.com> +Alfredo Gimenez <gimenez1@llnl.gov> Alfredo Adolfo Gimenez <alfredo.gimenez@gmail.com> +Andrew Williams <williamsa89@cardiff.ac.uk> Andrew Williams <andrew@alshain.org.uk> +Ben Boeckel <ben.boeckel@kitware.com> Ben Boeckel <mathstuf@gmail.com> +Ben Boeckel <ben.boeckel@kitware.com> Ben Boeckel <mathstuf@users.noreply.github.com> +Benedikt Hegner <hegner@cern.ch> Benedikt Hegner <benedikt.hegner@cern.ch> +Brett Viren <bv@bnl.gov> Brett Viren <brett.viren@gmail.com> +David Boehme <boehme3@llnl.gov> David Boehme <boehme3@sierra324.llnl.gov> +David Boehme <boehme3@llnl.gov> David Boehme <boehme3@sierra648.llnl.gov> +David Poliakoff <poliakoff1@llnl.gov> David Poliakoff <david.poliakoff@gmail.com> +Dhanannjay Deo <dhanannjay.deo@kitware.com> Dhanannjay 'Djay' Deo <dhanannjay.deo@kitware.com> +Elizabeth Fischer <elizabeth.fischer@columbia.edu> Elizabeth F <elizabeth.fischer@columbia.edu> +Elizabeth Fischer <elizabeth.fischer@columbia.edu> Elizabeth F <rpf2116@columbia.edu> +Elizabeth Fischer <elizabeth.fischer@columbia.edu> Elizabeth Fischer <rpf2116@columbia.edu> +Elizabeth Fischer <elizabeth.fischer@columbia.edu> citibeth <rpf2116@columbia.edu> +Geoffrey Oxberry <oxberry1@llnl.gov> Geoffrey Oxberry <goxberry@gmail.com> +Glenn Johnson <glenn-johnson@uiowa.edu> Glenn Johnson <gjohnson@argon-ohpc.hpc.uiowa.edu> +Glenn Johnson <glenn-johnson@uiowa.edu> Glenn Johnson <glennpj@gmail.com> +Gregory Becker <becker33@llnl.gov> Gregory Becker <becker33.llnl.gov> +Gregory Becker <becker33@llnl.gov> becker33 <becker33.llnl.gov> +Gregory Becker <becker33@llnl.gov> becker33 <becker33@llnl.gov> +Gregory L. Lee <lee218@llnl.gov> Greg Lee <lee218@llnl.gov> +Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@cab687.llnl.gov> +Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@cab690.llnl.gov> +Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@catalyst159.llnl.gov> +Gregory L. Lee <lee218@llnl.gov> Gregory L. Lee <lee218@surface86.llnl.gov> +Gregory L. Lee <lee218@llnl.gov> Gregory Lee <lee218@llnl.gov> +Ian Lee <lee1001@llnl.gov> Ian Lee <IanLee1521@gmail.com> +James Wynne III <wynnejr@ornl.gov> James Riley Wynne III <wynnejr@ornl.gov> +James Wynne III <wynnejr@ornl.gov> James Wynne III <wynnejr@gpujake.com> +Joachim Protze <protze@rz.rwth-aachen.de> jprotze <protze@rz.rwth-aachen.de> +Kelly (KT) Thompson <kgt@lanl.gov> <kellyt@MENE.localdomain> +Kelly (KT) Thompson <kgt@lanl.gov> Kelly Thompson <KineticTheory@users.noreply.github.com> +Kevin Brandstatter <kjbrandstatter@gmail.com> Kevin Brandstatter <kbrandst@hawk.iit.edu> +Luc Jaulmes <luc.jaulmes@bsc.es> Luc Jaulmes <jaulmes1@llnl.gov> +Mario Melara <maamelara@gmail.com> Mario Melara <mamelara@genepool1.nersc.gov> +Mark Miller <miller86@llnl.gov> miller86 <miller86@llnl.gov> +Massimiliano Culpo <massimiliano.culpo@epfl.ch> Massimiliano Culpo <massimiliano.culpo@googlemail.com> +Massimiliano Culpo <massimiliano.culpo@epfl.ch> alalazo <massimiliano.culpo@googlemail.com> +Mayeul d'Avezac <m.davezac@ucl.ac.uk> Mayeul d'Avezac <mdavezac@gmail.com> +Mitchell Devlin <mitchell.r.devlin@gmail.com> Mitchell Devlin <devlin@blogin4.lcrc.anl.gov> +Nicolas Richart <nicolas.richart@epfl.ch> Nicolas <nrichart@users.noreply.github.com> +Nicolas Richart <nicolas.richart@epfl.ch> Nicolas Richart <nrichart@users.noreply.github.com> +Peter Scheibel <scheibel1@llnl.gov> scheibelp <scheibel1@llnl.gov> +Robert D. French <frenchrd@ornl.gov> Robert D. French <robert@robertdfrench.me> +Robert D. French <frenchrd@ornl.gov> Robert.French <frenchrd@ornl.gov> +Robert D. French <frenchrd@ornl.gov> robertdfrench <frenchrd@ornl.gov> +Saravan Pantham <saravan.pantham@gmail.com> Saravan Pantham <pantham1@surface86.llnl.gov> +Stephen Herbein <sherbein@udel.edu> Stephen Herbein <stephen272@gmail.com> +Todd Gamblin <tgamblin@llnl.gov> George Todd Gamblin <gamblin2@llnl.gov> +Todd Gamblin <tgamblin@llnl.gov> Todd Gamblin <gamblin2@llnl.gov> +Tom Scogland <tscogland@llnl.gov> Tom Scogland <scogland1@llnl.gov> +Tom Scogland <tscogland@llnl.gov> Tom Scogland <tom.scogland@gmail.com> +Tzanio Kolev <tzanio@llnl.gov> Tzanio <tzanio@llnl.gov> |