From: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Date: Thu, 25 Sep 2014 10:59:26 +0000 (+0530)
Subject: mailmap: John Wilkins name normalization
X-Git-Tag: v0.88~143^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91af25f6c22b9642caa000fff3fd757ad5cc55c6;p=ceph.git

mailmap: John Wilkins name normalization

Also adding John Wilkins to .peoplemap to track org change

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
---

diff --git a/.mailmap b/.mailmap
index 63ab95b0aa3b..203c496396c2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -76,6 +76,9 @@ John Spray <jspray@redhat.com> <jcspray@gmail.com>
 John Wilkins <john.wilkins@inktank.com> <john@admin-host.(none)>
 John Wilkins <john.wilkins@inktank.com> <john.wilkins@dreamhost.com>
 John Wilkins <john.wilkins@inktank.com> <johnw@johnw7664.(none)>
+John Wilkins <jwilkins@redhat.com> <jowilk@redhat.com>
+John Wilkins <jwilkins@redhat.com> <jowilki@redhat.com>
+John Wilkins <jwilkins@redhat.com> <jowilkin@redhat.com>
 Johnu George <johnugeo@cisco.com> <johnugeorge109@gmail.com>
 Josh Durgin <josh.durgin@inktank.com> <joshd@hq.newdream.net>
 Josh Durgin <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
diff --git a/.peoplemap b/.peoplemap
index 46c0a882a1d7..1bee8e9a6cee 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -21,5 +21,6 @@ Loic Dachary <loic@dachary.org> Loic Dachary <loic-201408@dachary.org>
 Ross Turk <rturk@redhat.com> Ross Turk <ross.turk@inktank.com>
 Sage Weil <sweil@redhat.com> Sage Weil <sage@inktank.com>
 Yehuda Sadeh <ysadey@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>
 Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>