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

mailmap: Update Alfredo Deza's attribution to Red Hat

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

diff --git a/.mailmap b/.mailmap
index 4c010d21b6ef..b46104ffe4c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,7 +14,7 @@ Alexandre Oliva <oliva@gnu.org> <oliva@lsd.ic.unicamp.br>
 Alex Elder <elder@inktank.com> <elder@doink.(none)>
 Alex Elder <elder@inktank.com> <elder@dreamhost.com>
 Alex Elder <elder@inktank.com> <elder@speedy.(none)>
-Alfredo Deza <alfredo.deza@inktank.com> <alfredo@deza.pe>
+Alfredo Deza <adeza@redhat.com> <alfredo@deza.pe>
 Andreas Peters <andreas.joachim.peters@cern.ch> <Andreas.Joachim.Peters@cern.ch>
 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>
diff --git a/.organizationmap b/.organizationmap
index c715e93fd820..2f647129f9a4 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -87,7 +87,6 @@ Hostplex Hosting <contact@hostplex.net> Andras Elso <elso.andras@gmail.com>
 iNic <contact@inic.no> Bjørnar Ness <bjornar.ness@gmail.com>
 Inktank <contact@inktank.com> Alexandre Marangone <alexandre.marangone@inktank.com>
 Inktank <contact@inktank.com> Alex Elder <elder@inktank.com>
-Inktank <contact@inktank.com> Alfredo Deza <alfredo.deza@inktank.com>
 Inktank <contact@inktank.com> Caleb Miles <caleb.miles@inktank.com>
 Inktank <contact@inktank.com> Dan Mick <dan.mick@inktank.com>
 Inktank <contact@inktank.com> David Zafman <david.zafman@inktank.com>
diff --git a/.peoplemap b/.peoplemap
index 5757bcc52f5b..a487cdeae69a 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -15,6 +15,8 @@
 #
 # git log --pretty='%aN <%aE>' $range | git -c mailmap.file=.peoplemap check-mailmap --stdin | sort | uniq | sed -e 's/\(.*\) \(<.*\)/\2 \1/' | uniq --skip-field=1 --all-repeated | sed -e 's/\(.*>\) \(.*\)/\2 \1/'
 #
+Alexandre Marangone <amarango@redhat.com> Alexandre Marangone <alexandre.marangone@inktank.com>
+Alfredo Deza <adeza@redhat.com> Alfreda Deza <alfredo.deza@inktank.com>
 David Zafman <dzafman@redhat.com> David Zafman <david.zafman@inktank.com>
 Greg Farnum <gfarnum@redhat.com> Greg Farnum <greg@inktank.com>
 John Spray <jspray@redhat.com> John Spray <john.spray@inktank.com>