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

mailmap: Update Noah Watkins' attribution to Red Hat

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

diff --git a/.mailmap b/.mailmap
index f0bdcc9149d01..8af93f6541900 100644
--- a/.mailmap
+++ b/.mailmap
@@ -108,8 +108,8 @@ Michael Riederer <michael@riederer.org> dynamike67 <michael@riederer.org>
 Michael Rodriguez <michael@newdream.net> <michael@newdream.net>
 Michael Rodriguez <michael@newdream.net> <michael@squid.newdream.net>
 Neil Levine <neil.levine@inktank.com> <levine@yoyo.org>
-Noah Watkins <noah.watkins@inktank.com> <jayhawk@cs.ucsc.edu>
-Noah Watkins <noah.watkins@inktank.com> <noahwatkins@gmail.com>
+Noah Watkins <nwatkins@redhat.com> <jayhawk@cs.ucsc.edu>
+Noah Watkins <nwatkins@redhat.com> <noahwatkins@gmail.com>
 Pascal de Bruijn <pascal@unilogicnetworks.net> Pascal de Bruijn | Unilogic Networks B.V <pascal@unilogicnetworks.net>
 Patience Warnick <patience@cranium.pelton.net> <patiencew@29311d96-e01e-0410-9327-a35deaab8ce9>
 Patrick McGarry <patrick@inktank.com> <pmcgarry@gmail.com>
diff --git a/.peoplemap b/.peoplemap
index e62a6249bed04..489d0fc86248f 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -30,6 +30,7 @@ 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>
 Neil Levine <nlevine@redhat.com> Neil Levine <neil.levine@inktank.com>
+Noah Watkins <nwatkins@redhat.com> Noah Watkins <noah.watkins@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>