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

mailmap: Update Samuel Just's attribution to Red Hat

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

diff --git a/.mailmap b/.mailmap
index 8f264beef13b..3c1b2bd62f3d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -135,7 +135,7 @@ Sage Weil <sweil@redhat.com> Sage Weil <sage@redhat.com>
 Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com> <sahid.ferdjaoui@gmail.com>
 Sam Lang <sam.lang@inktank.com> <samlang@gmail.com>
 Samuel Just <sam.just@inktank.com> <sam.just@inktank.com>
-Samuel Just <sam.just@inktank.com> <rexludorum@gmail.com>
+Samuel Just <sjust@redhat.com> <rexludorum@gmail.com>
 Samuel Just <sam.just@inktank.com> <sam.just@dreamhost.com>
 Samuel Just <sam.just@inktank.com> Sam Just <sam.just@inktank.com>
 Samuel Just <sam.just@inktank.com> <sam@Pondermatic.(none)>
diff --git a/.peoplemap b/.peoplemap
index 1a37a5c6604b..1fa4944c573a 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -34,6 +34,7 @@ Noah Watkins <nwatkins@redhat.com> Noah Watkins <noah.watkins@inktank.com>
 Patrick McGarry <pmcgarry@redhat.com> Patrick McGarry <patrick@inktank.com>
 Ross Turk <rturk@redhat.com> Ross Turk <ross.turk@inktank.com>
 Sage Weil <sweil@redhat.com> Sage Weil <sage@inktank.com>
+Samuel Just <sjust@redhat.com> Samuel Just <sam.just@inktank.com>
 Yehuda Sadeh <ysadehwe@redhat.com> Yehuda Sadeh <yehuda@inktank.com>
 John Wilkins <jwilkins@redhat.com> John Wilkins <john.wilkins@inktank.com>
 Yan, Zheng <zyan@redhat.com> Yan, Zheng <zheng.z.yan@intel.com>