From: Chang Liu <liuchang0812@gmail.com>
Date: Thu, 16 Nov 2017 04:09:48 +0000 (+0800)
Subject: .mailmap, .organizationmap: update JingChen, ZongyouYao, ShanchunLv's mailmap and... 
X-Git-Tag: v13.0.1~199^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18960%2Fhead;p=ceph.git

.mailmap, .organizationmap: update JingChen, ZongyouYao, ShanchunLv's mailmap and affiliation

Signed-off-by: Chang Liu <liuchang0812@gmail.com>
---

diff --git a/.mailmap b/.mailmap
index 094334f37e03..8a7b8083a3c1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -191,6 +191,7 @@ Jianjian huo <jianjian.huo@ssi.samsung.com> <samuel.huo@gmail.com>
 Jingkai Yuan <jingkai.yuan@intel.com>
 Ji Chen <insomnia@139.com>
 Jie Li <li.jieA@h3c.com>
+Jing Chen <jeegnchen@gmail.com>
 João Eduardo Luís <joao.luis@inktank.com>
 João Eduardo Luís <joao.luis@inktank.com> <joao@inktank.com>
 João Eduardo Luís <joao@redhat.com>
@@ -369,6 +370,7 @@ Sebastien Ponce <sebastien.ponce@cern.ch> root <root@lxbre43a05.cern.ch>
 Sergey Arkhipov <nineseconds@yandex.ru>
 Shanggao Qiu <qiushanggao@qq.com>
 Shotaro Kawaguchi <kawaguchi.s@jp.fujitsu.com>
+Shanchun Lv <lvshanchun@gmail.com>
 Shawn Chen <cxwshawn@gmail.com>
 Shehbaz Jaffer <shehbaz.jaffer@mail.utoronto.ca> <shehbazjaffer007@gmail.com>
 Shinobu Kinjo <shinobu@redhat.com> <shinobu@linux.com> 
@@ -500,6 +502,7 @@ Zhang Lei <zhanglei@trendytech.com.cn>
 Zhang Lei <zhanglei@trendytech.com.cn> <243290414@qq.com>
 Zhang Shaowen <zhang_shaowen@139.com>
 Zhang Zezhu <zhang.zezhu@zte.com.cn>
+Zongyou Yao <yaozongyou@vip.qq.com>
 Guo Zhandong <guozhandong@cmss.chinamobile.com>
 Guo Zhandong <guozhandong@cmss.chinamobile.com> <18896723979@139.com>
 Guo Zhandong <guozhandong@cmss.chinamobile.com> <idealguo@139.com>
diff --git a/.organizationmap b/.organizationmap
index 718dc787ba7c..954d889f6e31 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -526,6 +526,10 @@ Telecom Bretagne <contact@telecom-bretagne.eu> Thomas Cantin <thomas.cantin@tele
 Tencent <contact@tencent.com> Wei Luo <weilluo@tencent.com>
 Tencent <contact@tencent.com> Wenjun Huang <wenjunhuang@tencent.com>
 Tencent <contact@tencent.com> Zhi Zhang <willzzhang@tencent.com>
+Tencent Cloud <contact@cloud.tencent.com> Chang Liu <liuchang0812@gmail.com>
+Tencent Cloud <contact@cloud.tencent.com> Jing Chen <jeegnchen@gmail.com>
+Tencent Cloud <contact@cloud.tencent.com> Shanchun Lv <lvshanchun@gmail.com>
+Tencent Cloud <contact@cloud.tencent.com> Zongyou Yao <yaozongyou@vip.qq.com>
 Teradata <contact@teradata.com> Nitin A Kamble <Nitin.Kamble@Teradata.com>
 The Linux Box <contact@linuxbox.com> Adam C. Emerson <aemerson@linuxbox.com>
 The Linux Box <contact@linuxbox.com> Ali Maredia <ali@linuxbox.com>
@@ -562,7 +566,6 @@ Unaffiliated <no@organization.net> Bosse Klykken <larkly@gmail.com>
 Unaffiliated <no@organization.net> Brian Felton <bjfelton@gmail.com>
 Unaffiliated <no@organization.net> Burkhard Linke <Burkhard.Linke@computational.bio.uni-giessen.de>
 Unaffiliated <no@organization.net> craigchi <craig10624@gmail.com>
-Unaffiliated <no@organization.net> Chang Liu <liuchang0812@gmail.com>
 Unaffiliated <no@organization.net> Charles Alva <charlesalva@gmail.com>
 Unaffiliated <no@organization.net> Chanyoung Park <park910113@gmail.com>
 Unaffiliated <no@organization.net> Cheng Cheng <ccheng.leo@gmail.com>