summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJim Galarowicz <jeg@krellinst.org>2015-08-18 08:05:25 -0500
committerJim Galarowicz <jeg@krellinst.org>2015-08-18 08:05:25 -0500
commitfe9959d4da40fec2b1cb151d51176de3c76c3b43 (patch)
tree7d486363a9dd19eb4c13194333fca8fd8275bbed /.mailmap
parent9fee7be695eb92391b8754593877dded097ea8c8 (diff)
parentc8f65c15306683a5d505d4bcafa603e75c09feca (diff)
downloadspack-fe9959d4da40fec2b1cb151d51176de3c76c3b43.tar.gz
spack-fe9959d4da40fec2b1cb151d51176de3c76c3b43.tar.bz2
spack-fe9959d4da40fec2b1cb151d51176de3c76c3b43.tar.xz
spack-fe9959d4da40fec2b1cb151d51176de3c76c3b43.zip
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap11
1 files changed, 11 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..1cc13c1eb1
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,11 @@
+Todd Gamblin <tgamblin@llnl.gov> George 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>