From: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
Date: Mon, 24 Jul 2017 15:01:05 +0000 (+0800)
Subject: Update my organization and mail
X-Git-Tag: v12.1.2~134^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16537%2Fhead;p=ceph.git

Update my organization and mail

Signed-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
---

diff --git a/.mailmap b/.mailmap
index 95c96cf8b1d7..4d98e7a756a8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -500,4 +500,5 @@ Zhiqiang Wang <zhiqiang.wang@intel.com> <wonzhq@hotmail.com>
 Zhi Zhang <willzzhang@tencent.com>
 Zhi Zhang <willzzhang@tencent.com> <zhangz.david@outlook.com>
 Zhi Zhang <willzzhang@tencent.com> <zhangzhi@localhost.localdomain>
+Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
 Zhuang Xiaochun <zhuangxc89@163.com>
diff --git a/.organizationmap b/.organizationmap
index bdb1fcd33593..2fabb2f4c25e 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -794,6 +794,7 @@ ZTE <contact@zte.com.cn> Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
 ZTE <contact@zte.com.cn> Xie Xingguo <xie.xingguo@zte.com.cn>
 ZTE <contact@zte.com.cn> Yan Jun <yan.jun8@zte.com.cn>
 ZTE <contact@zte.com.cn> Zhang Zezhu <zhang.zezhu@zte.com.cn>
+ZTE <contact@zte.com.cn> Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
 #
 # Local Variables:
 # compile-command: "git log --pretty='%aN <%aE>' | \