From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 24 Aug 2015 20:51:20 +0000 (+0200)
Subject: mailmap: Zhi Zhang affiliation
X-Git-Tag: v9.1.0~247^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33f8693365208684be62b307643cd56047c752de;p=ceph.git

mailmap: Zhi Zhang affiliation

Reviewed-by: Zhi Zhang <zhangz.david@outlook.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/.mailmap b/.mailmap
index 20244e046397..03f43e632d8a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -266,6 +266,7 @@ Yuan Zhou <yuan.zhou@intel.com> <dunk007@gmail.com>
 Zengran Zhang <zhangzengran@h3c.com> <zhangzengran@h3c.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
 Zhi (David) Zhang <zhangz@yahoo-inc.com> Zhi Z Zhang <zhangz@yahoo-inc.com>
+Zhi Zhang <zhangz.david@outlook.com> <zhangzhi@localhost.localdomain>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Wang, Zhiqiang <zhiqiang.wang@intel.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> Zhiqiang Wang <wonzhq@hotmail.com>
diff --git a/.organizationmap b/.organizationmap
index 5a5de231b08d..4123940b6fb5 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -297,6 +297,7 @@ Telecom Bretagne <contact@telecom-bretagne.eu> Ahoussi Armand <ahoussi.say@telec
 Telecom Bretagne <contact@telecom-bretagne.eu> Baptiste Veuillez <baptiste.veuillez--mainard@telecom-bretagne.eu>
 Telecom Bretagne <contact@telecom-bretagne.eu> Hazem Amara <hazem.amara@telecom-bretagne.eu>
 Telecom Bretagne <contact@telecom-bretagne.eu> Thomas Cantin <thomas.cantin@telecom-bretagne.eu>
+Tencent <contact@tencent.com> Zhi Zhang <zhangz.david@outlook.com>
 The Linux Box <contact@linuxbox.com> Adam C. Emerson <aemerson@linuxbox.com>
 The Linux Box <contact@linuxbox.com> Ali Maredia <ali@linuxbox.com>
 The Linux Box <contact@linuxbox.com> Casey Bodley <casey@linuxbox.com>
diff --git a/.peoplemap b/.peoplemap
index c29508a322df..ac7934a91cfd 100644
--- a/.peoplemap
+++ b/.peoplemap
@@ -44,3 +44,4 @@ Warren Usui <wusui@redhat.com> Warren Usui <warren.usui@inktank.com>
 Yan, Zheng <zyan@redhat.com> Yan, Zheng <zheng.z.yan@intel.com>
 Yehuda Sadeh <ysadehwe@redhat.com> Yehuda Sadeh <yehuda@inktank.com>
 Yuri Weinstein <yuri.weinstein@redhat.com> Yuri Weinstein <yuri.weinstein@inktank.com>
+Zhi Zhang <zhangz.david@outlook.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>