]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mailmap: Andreas Gerstmayr affiliation
authorYann Dupont <yann@objoo.org>
Wed, 5 Oct 2016 20:58:15 +0000 (22:58 +0200)
committerYann Dupont <yann@objoo.org>
Sun, 16 Oct 2016 20:16:24 +0000 (22:16 +0200)
Signed-off-by: Yann Dupont <yann@objoo.org>
.mailmap
.organizationmap

index 7645179cdd8b2d3700c4548e1fe40dbd863ecb9c..94a141b0212733e625a2d498c9dbb8ae2335c732 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -23,6 +23,7 @@ Alex Elder <elder@inktank.com> <elder@dreamhost.com>
 Alex Elder <elder@inktank.com> <elder@speedy.(none)>
 Alexis Normand <n.al3xis@gmail.com> <smagtony>
 Alfredo Deza <adeza@redhat.com> <alfredo@deza.pe>
+Andreas Gerstmayr <andreas.gerstmayr@catalysts.cc> <andreas.gerstmayr@gmail.com>
 Andreas Peters <andreas.joachim.peters@cern.ch> <Andreas.Joachim.Peters@cern.ch>
 Andrew Bartlett <abartlet@catalyst.net.nz> <abartlet@samba.org>
 Andrew Leung <aleung@cs.ucsc.edu> <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
index 3539f74c54432b6dc4e40828266faa1ddd538f43..87074c25196767d9ee0d02eba45bc06ed9eaab9c 100644 (file)
@@ -39,6 +39,7 @@ Canonical <contact@canonical.com> James Page <james.page@ubuntu.com>
 Canonical <contact@canonical.com> Jonathan Davies <jonathan.davies@canonical.com>
 Carnegie Mellon University <contact@cmu.edu> Jan Harkes <jaharkes@cs.cmu.edu>
 Catalyst <enquiries@catalyst.net.nz> Andrew Bartlett <abartlet@catalyst.net.nz>
+Catalysts <office@catalysts.cc> Andreas Gerstmayr <andreas.gerstmayr@catalysts.cc>
 CCM Benchmark <contact@ccmbenchmark.com> Laurent Barbe <laurent@ksperis.com>
 Cdiscount <contact@cdiscount.com> RĂ©mi Buisson <remi.buisson@cdiscount.com>
 CERN <contact@cern.ch> Andreas Peters <andreas.joachim.peters@cern.ch>