summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorZhao Chao <zhaochao1984@gmail.com>2017-02-14 09:39:15 +0100
committerZhao Chao <zhaochao1984@gmail.com>2017-03-02 11:50:29 +0100
commit01d816cb55bdb3d5121004e8ba6255f551e337eb (patch)
tree478390c096c99ea7f3fb0be38e63a9f1a86ea77d /.mailmap
parentMerge pull request #13427 from ly798/update-info (diff)
downloadceph-01d816cb55bdb3d5121004e8ba6255f551e337eb.tar.xz
ceph-01d816cb55bdb3d5121004e8ba6255f551e337eb.zip
mailmap: fix Zhao Chao affiliation.
Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index b6fb8cb38b0..8440ea9db61 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>