From: Zhiqiang Wang <wonzhq@hotmail.com>
Date: Tue, 16 Sep 2014 08:46:07 +0000 (+0800)
Subject: mailmap: correcting Zhiqiang Wang's mailmap and org affiliation
X-Git-Tag: v0.88~182^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2487%2Fhead;p=ceph.git

mailmap: correcting Zhiqiang Wang's mailmap and org affiliation

Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
---

diff --git a/.mailmap b/.mailmap
index fb971b155c2..11d6d6ece99 100644
--- a/.mailmap
+++ b/.mailmap
@@ -162,3 +162,5 @@ Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda>
 Yehuda Sadeh <yehuda@inktank.com> <yehuda@yehuda.infit.com>
 Yehuda Sadeh <ysadey@redhat.com> <yehuda@redhat.com>
 Zhiqiang Wang <wonzhq@hotmail.com> Signed-off-by: Zhiqiang Wang <wonzhq@hotmail.com>
+Zhiqiang Wang <wonzhq@hotmail.com> Zhiqiang Wang <wonzhq@hotmail.com>
+Zhiqiang Wang <wonzhq@hotmail.com> Zhiqiang Wang <zhiqiang.wang@intel.com>
diff --git a/.organizationmap b/.organizationmap
index f7cd47c0353..532a49d051d 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -120,6 +120,7 @@ Intel <contact@intel.com> Shu, Xinxin <xinxin.shu@intel.com>
 Intel <contact@intel.com> Wang, Yaguang <yaguang.wang@intel.com>
 Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
 Intel <contact@intel.com> Xiaoxi Chen <xiaoxi.chen@intel.com>
+Intel <contact@intel.com> Zhiqiang Wang <wonzhq@hotmail.com>
 Iron Systems Inc. <info@ironsystems.com> Harpreet Dhillon <harpreet@ironsystems.com>
 IT Refined <contact@itrefined.com> Ron Allred <rallred@itrefined.com>
 IWeb <contact@iweb.com> David Moreau Simard <dmsimard@iweb.com>
@@ -211,7 +212,6 @@ Unaffiliated <no@organization.net> (no author) <(no author)@29311d96-e01e-0410-9
 Unaffiliated <no@organization.net> Shawn Edwards <lesser.evil@gmail.com>
 Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
 Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
-Unaffiliated <no@organization.net> Zhiqiang Wang <wonzhq@hotmail.com>
 Unilogic Networks B.V <contact@unilogicnetworks.net> Pascal de Bruijn <pascal@unilogicnetworks.net> 
 UnitedStack <contact@unitedstack.com> Guangliang Zhao <guangliang@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Haomai Wang <haomaiwang@gmail.com>