From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 14 Nov 2014 21:51:10 +0000 (-0800)
Subject: mailmap: Update Dan Mick's attribution
X-Git-Tag: v0.90~48^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eaa9889bde3adce910026ed8ed2bcb4282265419;p=ceph.git

mailmap: Update Dan Mick's attribution

Point his addresses at Red Hat now, but revert the Inktank->Redhat mappings
so we have more historical accuracy.

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

diff --git a/.mailmap b/.mailmap
index b46104ffe4c0..68e436976537 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,10 +32,8 @@ Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gm
 Colin P. McCabe <colinm@hq.newdream.net> <cmccabe@alumni.cmu.edu>
 Colin P. McCabe <colinm@hq.newdream.net> <cmccabe@fatty.ops.newdream.net>
 Dan Chai <tengweicai@gmail.com> danchai <tengweicai@gmail.com>
-Dan Mick <dan.mick@redhat.com> <dan.mick@dreamhost.com>
-Dan Mick <dan.mick@redhat.com> <dan.mick@intank.com>
+Dan Mick <dan.mick@inktank.com> <dan.mick@dreamhost.com>
 Dan Mick <dan.mick@redhat.com> <dmick@danceorelse.org>
-Dan Mick <dan.mick@redhat.com> <dan.mick@inktank.com>
 Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
 David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
 Dmitry Smirnov <onlyjob@member.fsf.org> <onlyjob@debian.org>
diff --git a/.peoplemap b/.peoplemap
index a487cdeae69a..99225acb25e4 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -17,6 +17,7 @@
 #
 Alexandre Marangone <amarango@redhat.com> Alexandre Marangone <alexandre.marangone@inktank.com>
 Alfredo Deza <adeza@redhat.com> Alfreda Deza <alfredo.deza@inktank.com>
+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>
 John Spray <jspray@redhat.com> John Spray <john.spray@inktank.com>