]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mailmap: Update Mark Nelson's attribution to Red Hat
authorGreg Farnum <gfarnum@redhat.com>
Fri, 14 Nov 2014 22:06:05 +0000 (14:06 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Mon, 24 Nov 2014 05:01:56 +0000 (21:01 -0800)
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
.mailmap
.peoplemap

index f49892df35fe3e13f26bcf6b4b0d0277ec69ad83..f0bdcc9149d01210e449df2a371c684a833d50ff 100644 (file)
--- 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)>
index 24dd0c276a10828c5002792bbb438ccd63892d06..c6092eca80b82f342a932cea5aece44d240ca4e5 100644 (file)
@@ -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>