From: Loic Dachary <loic-201408@dachary.org>
Date: Sat, 16 Aug 2014 09:12:34 +0000 (+0200)
Subject: mailmap: Shu, Xinxin affiliation
X-Git-Tag: v0.86~229^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55227aaeec3f524e1b2aaeb83214b2d7089e4296;p=ceph.git

mailmap: Shu, Xinxin affiliation

and name normalization

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
---

diff --git a/.mailmap b/.mailmap
index 52f16678424b..891f47cc4ce7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -117,6 +117,8 @@ Samuel Just <sam.just@inktank.com> <samuel.just@inktank.com>
 Sandon Van Ness <sandon@inktank.com> SandonV <sandon@inktank.com>
 Sebastien Han <sebastien.han@enovance.com> <sebastien.han@enovance.com>
 Sebastien Ponce <sebastien.ponce@cern.ch> Sebastien Ponce <Sebastien.Ponce@cern.ch>
+Shu, Xinxin <xinxin.shu@intel.com> xinxinsh <xinxin.shu@intel.com>
+Shu, Xinxin <xinxin.shu@intel.com> xinxin shu <xinxin.shu@intel.com>
 Stephen F Taylor <steveftaylor@gmail.com> <steve@DES-U1404-STETAY.stc.local>
 Sushma Gurram <sushma.gurram@sandisk.com> sushma <sushma.gurram@sandisk.com>
 Sylvain Munaut <s.munaut@whatever-company.com> <tnt@246tNt.com>
diff --git a/.organizationmap b/.organizationmap
index 178dd30b19c0..6ce00f015ec3 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -111,6 +111,7 @@ Inktank <contact@inktank.com> Tyler Brekke <tyler.brekke@inktank.com>
 Inktank <contact@inktank.com> Warren Usui <warren.usui@inktank.com>
 Inktank <contact@inktank.com> Yehuda Sadeh <yehuda@inktank.com>
 Intel <contact@intel.com> Ma Jianpeng <jianpeng.ma@intel.com>
+Intel <contact@intel.com> Shu, Xinxin <xinxin.shu@intel.com>
 Intel <contact@intel.com> Wang, Yaguang <yaguang.wang@intel.com>
 Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
 Iron Systems Inc. <info@ironsystems.com> Harpreet Dhillon <harpreet@ironsystems.com>