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

mailmap: Update Greg Farnum's attribution to Red Hat

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

diff --git a/.mailmap b/.mailmap
index 2ef4d378861..4c010d21b6e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -51,12 +51,12 @@ Gary Lowell <gary.lowell@inktank.com> Gary Lowelll <gary.lowell@inktank.com>
 Gary Lowell <gary.lowell@inktank.com> <glowell@flab.ops.newdream.net>
 Gary Lowell <gary.lowell@inktank.com> <glowell@inktank.com>
 Gerben Meijer <gerben@daybyday.nl> <infernix@gmail.com>
-Greg Farnum <greg@inktank.com> <gfarnum@GF-Macbook.local>
+Greg Farnum <gfarnum@redhat.com> <gfarnum@GF-Macbook.local>
 Greg Farnum <greg@inktank.com> Greg Farnu <greg@inktank.com>
 Greg Farnum <greg@inktank.com> <greg.farnum@dreamhost.com>
 Greg Farnum <greg@inktank.com> <gregf@hq.newdream.net>
 Greg Farnum <greg@inktank.com> <gregf@skinny.ops.newdream.net>
-Greg Farnum <greg@inktank.com> <greg@gregs42.com>
+Greg Farnum <gfarnum@redhat.com> <greg@gregs42.com>
 Greg Farnum <greg@inktank.com> <gregory.farnum@dreamhost.com>
 Greg Farnum <greg@inktank.com> Gregory Farnum <greg@inktank.com> 
 Greg Farnum <greg@inktank.com> Reviewed-by: Greg Farnum <greg@inktank.com>
diff --git a/.peoplemap b/.peoplemap
index a0aa7026ae3..5757bcc52f5 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -16,6 +16,7 @@
 # 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/'
 #
 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>
 Loic Dachary <ldachary@redhat.com> Loic Dachary <loic-201408@dachary.org>
 Loic Dachary <ldachary@redhat.com> Loic Dachary <loic@dachary.org>