From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 28 Oct 2015 09:06:08 +0000 (+0900)
Subject: mailmap: Xie Xingguo affiliation
X-Git-Tag: v10.0.0~40^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f22f4ac293cdeaf9f44250a2fc4b83269084ff63;p=ceph.git

mailmap: Xie Xingguo affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/.mailmap b/.mailmap
index 947d3ddbb434..31cc322d3968 100644
--- a/.mailmap
+++ b/.mailmap
@@ -264,7 +264,8 @@ Xiaowei Chen <chen.xiaowei@h3c.com> <cxwshawn@gmail.com>
 Xiaowei Chen <chen.xiaowei@h3c.com> <chen.xiaowei@h3c.com>
 Xie Rui <875016668@qq.com> Jerry7X <875016668@qq.com>
 Xie Rui <875016668@qq.com> Xie Rui <jerry.xr86@gmail.com>
-Xie Xiexingguo <xie.xiexingguo@zte.com.cn>  <258156334@qq.com>
+Xie Xingguo <xie.xingguo@zte.com.cn> <258156334@qq.com>
+Xie Xingguo <xie.xingguo@zte.com.cn> <xie.xiexingguo@zte.com.cn>
 Xingyi Wu <wuxingyi2015@outlook.com>
 Xinze Chi <xinze@xsky.com> <xmdxcxz@gmail.com>
 Xinze Chi <xinze@xsky.com> <xinze@xksy.com>
diff --git a/.organizationmap b/.organizationmap
index ece2325fd0d0..c9a4532c591e 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -476,7 +476,7 @@ Yahoo! <contact@yahoo-inc.com> Xihui He <xihuihe@gmail.com>
 Yahoo! <contact@yahoo-inc.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
 YouScribe <contact@youscribe.fr> Guilhem Lettron <guilhem@lettron.fr>
 ZTE <contact@zte.com.cn> Ren Huanwen <ren.huanwen@zte.com.cn>
-ZTE <contact@zte.com.cn> <xie.xiexingguo@zte.com.cn>
+ZTE <contact@zte.com.cn> <xie.xingguo@zte.com.cn>
 #
 # Local Variables:
 # compile-command: "git log --pretty='%aN <%aE>' | \