From: Zhao Chao <zhaochao1984@gmail.com>
Date: Tue, 14 Feb 2017 08:39:15 +0000 (+0800)
Subject: mailmap: fix Zhao Chao affiliation.
X-Git-Tag: v12.0.1~184^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01d816cb55bdb3d5121004e8ba6255f551e337eb;p=ceph.git

mailmap: fix Zhao Chao affiliation.

Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>
---

diff --git a/.mailmap b/.mailmap
index b6fb8cb38b08b..8440ea9db6167 100644
--- a/.mailmap
+++ b/.mailmap
@@ -466,6 +466,7 @@ Zhang Zezhu <zhang.zezhu@zte.com.cn>
 Guo Zhandong <guozhandong@cmss.chinamobile.com>
 Guo Zhandong <guozhandong@cmss.chinamobile.com> <18896723979@139.com>
 Guo Zhandong <guozhandong@cmss.chinamobile.com> <idealguo@139.com>
+Zhao Chao <zhaochao1984@gmail.com>
 Zhao Kun <jswps2011@163.com>
 Zhou Rui Song <236131368@qq.com>
 Zhou Rui Song <236131368@qq.com> <root@korea-fg-ceph-57-117.120.120.117>
diff --git a/.organizationmap b/.organizationmap
index e46c0cfd558e7..55dc75e1e9970 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -102,6 +102,7 @@ Dtdream <contact@dtdream.com> Li Peng <lip@dtdream.com>
 Dtdream <contact@dtdream.com> Wei Qian <weiq@dtdream.com>
 Eayun <contact@eayun.com> Dunrong Huang <dunrong.huang@eayun.com>
 Eayun <contact@eayun.com> Liu Yang <yippeetry@gmail.com>
+Eayun <contact@eayun.com> Zhao Chao <zhaochao1984@gmail.com>
 Ebay <contact@ebay.com> Chengyuan Li <chengyli@ebay.com>
 Ebay <contact@ebay.com> Xiaoxi Chen <xiaoxchen@ebay.com>
 Ebay <contact@ebay.com> You Ji <youji@ebay.com>
@@ -670,7 +671,6 @@ Unaffiliated <no@organization.net> YiQiang Chen <cyqsign@163.com>
 Unaffiliated <no@organization.net> Yongyue Sun <abioy.sun@gmail.com>
 Unaffiliated <no@organization.net> You Ji <jiyou09@gmail.com>
 Unaffiliated <no@organization.net> Zhang Shaowen <zhang_shaowen@139.com>
-Unaffiliated <no@organization.net> Zhao Chao <zhaochao1984@gmail.com>
 Unaffiliated <no@organization.net> Zhao Junwang <zhjwpku@gmail.com>
 Unaffiliated <no@organization.net> Zhao Kun <jswps2011@163.com>
 Unaffiliated <no@organization.net> Zhe Zhang <zzxuanyuan@gmail.com>