From: Yann Dupont <yann@objoo.org>
Date: Wed, 3 Feb 2016 23:22:03 +0000 (+0100)
Subject: mailmap: Zhi Zhang affiliation
X-Git-Tag: v10.1.0~393^2~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c423d5fc9da7754b96057ff59b929a68578f1f32;p=ceph.git

mailmap: Zhi Zhang affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
---

diff --git a/.mailmap b/.mailmap
index aa1ec4b5b2c..613e4dc78d6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -318,4 +318,5 @@ Zhi (David) Zhang <zhangz@yahoo-inc.com> <david.z1003@yahoo.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com>
 Zhiqiang Wang <zhiqiang.wang@intel.com> <wonzhq@hotmail.com>
 Zhi Zhang <willzzhang@tencent.com>
-Zhi Zhang <zhangz.david@outlook.com> <zhangzhi@localhost.localdomain>
+Zhi Zhang <willzzhang@tencent.com> <zhangz.david@outlook.com>
+Zhi Zhang <willzzhang@tencent.com> <zhangzhi@localhost.localdomain>
diff --git a/.organizationmap b/.organizationmap
index 28696966454..f6f9a4b390e 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -348,7 +348,7 @@ Telecom Bretagne <contact@telecom-bretagne.eu> Hazem Amara <hazem.amara@telecom-
 Telecom Bretagne <contact@telecom-bretagne.eu> Thomas Cantin <thomas.cantin@telecom-bretagne.eu>
 Tencent <contact@tencent.com> Wei Luo <weilluo@tencent.com>
 Tencent <contact@tencent.com> Wenjun Huang <wenjunhuang@tencent.com>
-Tencent <contact@tencent.com> Zhi Zhang <zhangz.david@outlook.com>
+Tencent <contact@tencent.com> Zhi Zhang <willzzhang@tencent.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>