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

mailmap: Update Mark Nelson's attribution to Red Hat

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

diff --git a/.mailmap b/.mailmap
index f49892df35fe..f0bdcc9149d0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -100,7 +100,7 @@ Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
 Ma Jianpeng <jianpeng.ma@intel.com> Ma, Jianpeng <jianpeng.ma@intel.com>
 Ma Jianpeng <jianpeng.ma@intel.com> Jianpeng Ma <jianpeng.ma@intel.com>
 Marco Garcês <marco.garces@bci.co.mz> Marco Garcês <marco@garces.cc>
-Mark Nelson <mark.nelson@inktank.com> <mark.a.nelson@gmail.com>
+Mark Nelson <mnelson@redhat.com> <mark.a.nelson@gmail.com>
 Matthew Roy <matthew@royhousehold.net> <matthew@matthew-ubuntu.(none)>
 Matthew Roy <matthew@royhousehold.net> <mroy@sandbox-ed.com>
 Matthew Wodrich <matthew.wodrich@dreamhost.com> <mattheww@Mattsbox.(none)>
diff --git a/.peoplemap b/.peoplemap
index 24dd0c276a10..c6092eca80b8 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -28,6 +28,7 @@ Josh Durgin <jdurgin@redhat.com> Josh Durgin <josh.durgin@inktank.com>
 Ken Dreyer <kdreyer@redhat.com> Ken Dreyer <ken.dreyer@inktank.com>
 Loic Dachary <ldachary@redhat.com> Loic Dachary <loic-201408@dachary.org>
 Loic Dachary <ldachary@redhat.com> Loic Dachary <loic@dachary.org>
+Mark Nelson <mnelson@redhat.com> Mark Nelson <mark.nelson@inktank.com>
 Ross Turk <rturk@redhat.com> Ross Turk <ross.turk@inktank.com>
 Sage Weil <sweil@redhat.com> Sage Weil <sage@inktank.com>
 Yehuda Sadeh <ysadehwe@redhat.com> Yehuda Sadeh <yehuda@inktank.com>