From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 14 Nov 2014 21:57:53 +0000 (-0800)
Subject: mailmap: Update Joao Luis' attribution to Red Hat
X-Git-Tag: v0.90~48^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c84aa394209d903cfb6a82a1354fdc997ac0be46;p=ceph.git

mailmap: Update Joao Luis' attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/.mailmap b/.mailmap
index c7d84b45e3ad..f49892df35fe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -70,7 +70,7 @@ Huang Jun <hjwsm1989@gmail.com> huangjun <hjwsm1989@gmail.com>
 Ilya Dryomov <idryomov@redhat.com> <idryomov@gmail.com>
 Jiang Heng <jiangheng0511@gmail.com> jiangheng <jiangheng0511@gmail.com>
 Jiantao He <hejiantao5@gmail.com> hejiantao5 <hejiantao5@gmail.com>
-João Eduardo Luís <joao.luis@inktank.com> <jecluis@gmail.com>
+João Eduardo Luís <joao@redhat.com> <jecluis@gmail.com>
 João Eduardo Luís <joao.luis@inktank.com> Joao Eduardo Luis <joao.luis@inktank.com>
 João Eduardo Luís <joao.luis@inktank.com> <joao@inktank.com>
 João Eduardo Luís <joao.luis@inktank.com> Joao Luis <joao.luis@inktank.com>
diff --git a/.peoplemap b/.peoplemap
index e3d58fe99b86..9dc1be7ef6d2 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -21,6 +21,7 @@ Dan Mick <dmick@redhat.com> Dan Mick <dan.mick@inktank.com>
 David Zafman <dzafman@redhat.com> David Zafman <david.zafman@inktank.com>
 Greg Farnum <gfarnum@redhat.com> Greg Farnum <greg@inktank.com>
 Ilya Dryomov <idryomov@redhat.com> Ilya Dryomov <ilya.dryomov@inktank.com>
+João Eduardo Luís <joao@redhat.com> João Eduardo Luís <joao.luis@inktank.com>
 John Spray <jspray@redhat.com> John Spray <john.spray@inktank.com>
 Loic Dachary <ldachary@redhat.com> Loic Dachary <loic-201408@dachary.org>
 Loic Dachary <ldachary@redhat.com> Loic Dachary <loic@dachary.org>