From: Wei Jin <wjin.cn@gmail.com>
Date: Mon, 5 Dec 2016 02:30:32 +0000 (+0800)
Subject: mailmap: change personal info
X-Git-Tag: v11.1.0~62^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12310%2Fhead;p=ceph.git

mailmap: change personal info

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
---

diff --git a/.mailmap b/.mailmap
index a7bd098b29b9..f55f59253c8f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -362,6 +362,8 @@ Warren Usui <warren.usui@inktank.com>
 Warren Usui <wusui@redhat.com> <wusui@users.noreply.github.com>
 Weibing Zhang <zhangweibing@unitedstack.com>
 Weijun Duan <duanweijun@h3c.com>
+Wei Jin <jinwei15@wanda.cn>
+Wei Jin <jinwei15@wanda.cn> <wjin.cn@gmail.com>
 Wei Luo <luowei@yahoo-inc.com>
 Wei Luo <weilluo@tencent.com>
 Wei Qian <weiq@dtdream.com>
diff --git a/.organizationmap b/.organizationmap
index 1aa0e3104720..734fda5f47e2 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -586,7 +586,6 @@ Unaffiliated <no@organization.net> Vitja Makarov <vitja.makarov@gmail.com>
 Unaffiliated <no@organization.net> Vladislav Odintsov <odivlad@gmail.com>
 Unaffiliated <no@organization.net> Volker Voigt <volker.voigt@1und1.de>
 Unaffiliated <no@organization.net> VRan Liu <gliuwr@gmail.com>
-Unaffiliated <no@organization.net> Wei Jin <wjin.cn@gmail.com>
 Unaffiliated <no@organization.net> William A. Kennington III <william@wkennington.com>
 Unaffiliated <no@organization.net> Xan Peng <xanpeng@gmail.com>
 Unaffiliated <no@organization.net> Xie Rui <875016668@qq.com>
@@ -636,6 +635,7 @@ University of Utah <contact@utah.edu> Xing Lin <xinglin@cs.utah.edu>
 VRT <contact@vrt.com.au> Stuart Longland <stuartl@vrt.com.au>
 Walmart Labs <contact@walmartlabs.com> Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
 Walmart Labs <contact@walmartlabs.com> Sirisha Guduru <SGuduru@walmartlabs.com>
+Wanda ffan <contact@wanda.cn> Wei Jin <jinwei15@wanda.cn>
 Warpnet B.V. <contact@warpnet.nl> Gerhard Muntingh <gerhard@warpnet.nl>
 Web Drive <contact@webdrive.co.nz> Aristoteles Neto <aristoteles.neto@webdrive.co.nz>
 Whatever <contact@whatever-company.com> Sylvain Munaut <s.munaut@whatever-company.com>