From: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Date: Thu, 19 Feb 2015 10:33:33 +0000 (+0530)
Subject: mailmap: Andrew Bartlett affiliation
X-Git-Tag: suse_latest~17^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d6750e0d7270737a1003dd1085e56314f617973;p=ceph.git

mailmap: Andrew Bartlett affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Andrew Bartlett <abartlet@catalyst.net.nz>
---

diff --git a/.mailmap b/.mailmap
index 2b116c16f2f8..c8a1371e7315 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,6 +16,7 @@ Alex Elder <elder@inktank.com> <elder@dreamhost.com>
 Alex Elder <elder@inktank.com> <elder@speedy.(none)>
 Alfredo Deza <adeza@redhat.com> <alfredo@deza.pe>
 Andreas Peters <andreas.joachim.peters@cern.ch> <Andreas.Joachim.Peters@cern.ch>
+Andrew Bartlett <abartlet@catalyst.net.nz> Andrew Bartlett <abartlet@samba.org>
 Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
 Aristoteles Neto <aristoteles.neto@webdrive.co.nz>  <wdneto@users.noreply.github.com>
 Ashish Chandra <ashish.a.chandra@ril.com> <mail.ashishchandra@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index 995d14210620..1cf4f773e3de 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -33,6 +33,7 @@ Canonical <contact@canonical.com> Chris Glass <tribaal@gmail.com>
 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>
 CCM Benchmark <contact@ccmbenchmark.com> Laurent Barbe <laurent@ksperis.com>
 CERN <contact@cern.ch> Andreas Peters <andreas.joachim.peters@cern.ch>
 CERN <contact@cern.ch> Dan van der Ster <daniel.vanderster@cern.ch>