From: Zengran Zhang <zhangzengran@sangfor.com.cn>
Date: Fri, 23 Nov 2018 02:06:33 +0000 (+0800)
Subject: mailmap,orgnization: Update sangfor affiliation
X-Git-Tag: v14.1.0~817^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2bd75e32215b35bc7fc26cf7718662abfb263db8;p=ceph-ci.git

mailmap,orgnization: Update sangfor affiliation

Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
---

diff --git a/.mailmap b/.mailmap
index 3bd3cc97601..ebda66e6df8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -102,6 +102,7 @@ Fan Yang <yangf@neunn.com> <yfceph@gmail.com>
 Fangchen Sun <sunspot0105@gmail.com>
 Fang Yuxiang <fang.yuxiang@eisoo.com>
 Fang Yuxiang <fang.yuxiang@eisoo.com> <hrchu@users.noreply.github.com>
+Fang Yuxiang <fangyuxiang@sangfor.com>
 Federico Gimenez <fgimenez@coit.es> <federico.gimenez@hola-internet.com>
 Feng Wang <cyclonew@cs.ucsc.edu> <cyclonew@29311d96-e01e-0410-9327-a35deaab8ce9>
 Feng Yu <amoxic@126.com>
@@ -190,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>
+Jinling Zhao <zhaojinling@sangfor.com.cn>
 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>
@@ -219,6 +221,7 @@ Josh Durgin <jdurgin@redhat.com> <joshd@redhat.com>
 Josh Durgin <jdurgin@redhat.com> <jduring@redhat.com>
 Josh Durgin <josh.durgin@inktank.com> <joshd@hq.newdream.net>
 Josh Durgin <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
+Junhui Tang <tangjunhui@sangfor.com.cn>
 Kacper Kowalik <xarthisius@gentoo.org>
 Kanika Murarka <kmurarka@redhat.com> <murarkakanika@gmail.com>
 Kapil Sharma <ksharma@suse.com>
@@ -228,6 +231,7 @@ Ken Dreyer <kdreyer@redhat.com>
 Kévin Caradant <kevin.caradant@gmail.com>
 Kiseleva Alyona <akiselyova@mirantis.com>
 Kongming Wu <wu.kongming@h3c.com>
+Kuanlong Li <likuanlong@sangfor.com.cn>
 Lan De <lan.de3@zte.com.cn>
 Laszlo Boszormenyi <gcs@debian.hu>
 Leo Zhang <nguzcf@gmail.com>
@@ -274,6 +278,7 @@ Michael Rodriguez <michael@newdream.net>
 Michael Rodriguez <michael@newdream.net> <michael@squid.newdream.net>
 Michal Koutný <mkoutny@suse.com>
 Min Chen <minchen@ubuntukylin.com>
+Min Chen <chenmin@sangfor.com.cn>
 MingXin Liu <mingxin.liu@kylin-cloud.com> <mingxinliu@ubuntukylin.com>
 Mingqiao Wu <wumingqiao@inspur.com>
 Mingyue Zhao <zhao.mingyue@h3c.com>
@@ -290,6 +295,7 @@ Neha Ummareddy <nehaummareddy@gmail.com>
 Neil Levine <neil.levine@inktank.com> <levine@yoyo.org>
 Nick Fisk <nick@fisk.me.uk>
 Nicolas Yong <nicolas.yong93@gmail.com>
+Ning Tao <ningtao@sangfor.com.cn> <63358@sangfor.com>
 Ning Yao <yaoning@ruijie.com.cn> <zay11022@gmail.com>
 Ning Yao <yaoning@unitedstack.com>
 Noah Watkins <nwatkins@redhat.com> <jayhawk@cs.ucsc.edu>
@@ -381,6 +387,7 @@ Shinobu Kinjo <shinobu@redhat.com> <ceph@ceph-stack.redhat.com>
 Shishir Gowda <shishir.gowda@sandisk.com>
 Shiqi <m13913886148@gmail.com>
 Shiqi <m13913886148@gmail.com> <1454927420@qq.com>
+Shuai Yong <yongshuai@sangfor.com.cn>
 Shu, Xinxin <xinxin.shu@intel.com>
 Shun Song <song.shun3@zte.com.cn>
 Shun Song <song.shun3@zte.com.cn> <songshun134@126.com>
@@ -485,6 +492,7 @@ Yehuda Sadeh <ysadehwe@redhat.com> <yehuda@redhat.com>
 Yehuda Sadeh <ysadehwe@redhat.com> <yehuda@rehat.com>
 Yehuda Sadeh <ysadehwe@redhat.com> <ysadeh@redhat.com>
 Yehuda Sadeh <ysadehwe@redhat.com> <yehuda@redhat.com.>
+Ye Tian <tianye@sangfor.com.cn>
 Yichao Li <liyichao.good@gmail.com>
 Ying He <heyingbj@inspur.com>
 Yongqiang He <he.yongqiang@h3c.com>
@@ -500,9 +508,13 @@ Yuri Weinstein <yuriw@redhat.com> <yuriw@magna002.ceph.redhat.com>
 Yuri Weinstein <yuriw@redhat.com> <yweins@redhat.com>
 Yuri Weinstein <yuriw@redhat.com> <yuri.weinstein@redhat.com>
 Xianxia Xiao <xianxia.xiao@kylin-cloud.com>
+XiaoCheng Wang <wangxiaocheng@sangfor.com.cn>
+Xiaofei Cui <cuixiaofei@sangfor.com.cn> <cuixiaofei@sangfor.com>
 Zack Cerza <zack@redhat.com> <zack.cerza@inktank.com>
 Zack Cerza <zack@redhat.com> <zack@cerza.org>
 Zengran Zhang <zhangzengran@h3c.com>
+Zengran Zhang <zhangzengran@sangfor.com.cn> <13121369189@126.com>
+Zhen Zeng <zengzhen@sangfor.com.cn>
 Zeqiang Zhuang <zhuang.zeqiang@h3c.com>
 Zhang Lei <zhanglei@trendytech.com.cn>
 Zhang Lei <zhanglei@trendytech.com.cn> <243290414@qq.com>
diff --git a/.organizationmap b/.organizationmap
index e0352cc6881..8561e1e5774 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -488,6 +488,18 @@ SanDisk <contact@sandisk.com> Sushma Gurram <sushma.gurram@sandisk.com>
 SanDisk <contact@sandisk.com> Tomy Cheru <tomy.cheru@sandisk.com>
 SanDisk <contact@sandisk.com> Varada Kari <varada.kari@sandisk.com>
 SanDisk <contact@sandisk.com> Vishal Kanaujia <Vishal.Kanaujia@sandisk.com>
+Sangfor <contact-sds@sangfor.com.cn> Xiaocheng Wang <wangxiaocheng@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Tao Ning <ningtao@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Xiaofei Cui <cuixiaofei@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Ye Tian <tianye@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Zengran Zhang <zhangzengran@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Zhen Zeng <zengzhen@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Kuanlong Li <likuanlong@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Shuai Yong<yongshuai@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Fang Yuxiang <fangyuxiang@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Min Chen <chenmin@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Jinling Zhao <zhaojinling@sangfor.com.cn>
+Sangfor <contact-sds@sangfor.com.cn> Junhui Tang <tangjunhui@sangfor.com.cn>
 SAP <contact@sap.com> Marc Koderer <marc@koderer.com>
 Science & Technology Facilities Council <contact@stfc.ac.uk> George Ryall <george.ryall@stfc.ac.uk>
 SendFaster <contact@sendfaster.com> Christopher O'Connell <jwriteclub@gmail.com>