From: Swami Reddy <swamireddy@gmail.com>
Date: Fri, 21 Apr 2017 15:21:11 +0000 (+0530)
Subject: mailmap: shiqi name normalization
X-Git-Tag: v12.0.3~271^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19b9ecc98eba79ef9afbc22a7afea1db1aa6b33b;p=ceph.git

mailmap: shiqi name normalization

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
---

diff --git a/.mailmap b/.mailmap
index 23752a5e66343..671a3226d5e47 100644
--- a/.mailmap
+++ b/.mailmap
@@ -353,6 +353,7 @@ Shehbaz Jaffer <shehbaz.jaffer@mail.utoronto.ca> <shehbazjaffer007@gmail.com>
 Shinobu Kinjo <shinobu@redhat.com> <shinobu@linux.com> 
 Shinobu Kinjo <shinobu@redhat.com> <ceph@ceph-stack.redhat.com>
 Shishir Gowda <shishir.gowda@sandisk.com>
+shiqi <m13913886148@gmail.com> <1454927420@qq.com>
 Shu, Xinxin <xinxin.shu@intel.com>
 Shun Song <song.shun3@zte.com.cn>
 Shun Song <song.shun3@zte.com.cn> <songshun134@126.com>
diff --git a/.organizationmap b/.organizationmap
index 3b6850b0b91e4..15380404e329d 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -495,7 +495,7 @@ The Linux Box <contact@linuxbox.com> Casey Bodley <casey@linuxbox.com>
 The Linux Box <contact@linuxbox.com> Matt Benjamin <matt@linuxbox.com>
 The University of Arizona <contact@arizona.edu> James Ryan Cresawn <jrcresawn@gmail.com>
 Time Warner Cable Inc. <contact@twcable.com> Bryan Stillwell <bryan.stillwell@twcable.com>
-Uber <contact@uber.com> Henrik Korkuc <henrik@uber.com>
+Trendy Tech <contact@trendytech.com.cn> shiqi <m13913886148@gmail.com>
 Ubuntu Kylin <contact@ubuntukylin.com> Min Chen <minchen@ubuntukylin.com>
 UMCloud <contact@umcloud.com> Jiaying Ren <mikulely@gmail.com>
 UMCloud <contact@umcloud.com> Rongze Zhu <zrzhit@gmail.com>