From: Weibing Zhang <atheism.zhang@gmail.com>
Date: Sun, 14 May 2017 05:12:58 +0000 (+0800)
Subject: mailmap: Weibing Zhang mailmap affiliation
X-Git-Tag: v12.0.3~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15076%2Fhead;p=ceph.git

mailmap: Weibing Zhang mailmap affiliation

Signed-off-by: Weibing Zhang <atheism.zhang@gmail.com>
---

diff --git a/.mailmap b/.mailmap
index 671a3226d5e..7177ca8472b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -403,8 +403,7 @@ Warren Usui <warren.usui@inktank.com>
 Warren Usui <wusui@redhat.com> <wusui@users.noreply.github.com>
 Warren Usui <wusui@redhat.com> <wusui@magna002.ceph.redhat.com>
 Warren Usui <wusui@redhat.com> <wusui@ubuntu.(none)>
-Weibing Zhang <zhangweibing@unitedstack.com>
-Weibing Zhang <zhangweibing@unitedstack.com> <atheism.zhang@gmail.com>
+Weibing Zhang <atheism.zhang@gmail.com>
 Weijun Duan <duanweijun@h3c.com>
 Wei Jin <jinwei15@wanda.cn>
 Wei Jin <jinwei15@wanda.cn> <wjin.cn@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index ab1135d981e..190f56d84ba 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -703,6 +703,7 @@ Unaffiliated <no@organization.net> YiQiang Chen <cyqsign@163.com>
 Unaffiliated <no@organization.net> Yongyue Sun <abioy.sun@gmail.com>
 Unaffiliated <no@organization.net> You Ji <jiyou09@gmail.com>
 Unaffiliated <no@organization.net> Zhang Shaowen <zhang_shaowen@139.com>
+Unaffiliated <no@organization.net> Weibing Zhang <atheism.zhang@gmail.com>
 Unaffiliated <no@organization.net> Zhao Junwang <zhjwpku@gmail.com>
 Unaffiliated <no@organization.net> Zhao Kun <jswps2011@163.com>
 Unaffiliated <no@organization.net> Zhe Zhang <zzxuanyuan@gmail.com>
@@ -718,7 +719,6 @@ UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
 UnitedStack <contact@unitedstack.com> Li Tianqing <tianqing@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Ning Yao <yaoning@unitedstack.com>
 UnitedStack <contact@unitedstack.com> wangsongbo <wangsongbo@unitedstack.com>
-UnitedStack <contact@unitedstack.com> Weibing Zhang <zhangweibing@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Yankun Li <liyankun@unitedstack.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Adam Crume <adamcrume@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Andrew Leung <aleung@cs.ucsc.edu>