From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Wed, 23 Sep 2020 07:39:47 +0000 (+0800)
Subject: mailmap: update Intel employee mail/org
X-Git-Tag: v16.1.0~871^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37628%2Fhead;p=ceph.git

mailmap: update Intel employee mail/org

1. "changcheng.liu@aliyun.com" need be classified into intel until now.
   This reverts part of commit: df07e9f3
2. add "Yuan Lu <yuan.y.lu@intel.com>" in mailmap

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
---

diff --git a/.mailmap b/.mailmap
index 2541ac70cfd9..6bce89cfefd5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -348,6 +348,7 @@ Lin Xu Hua <linxuhua@unionpay.com>
 Linfei Hou <hou.linfei@h3c.com>
 Linpeng Dong <donglinpeng@cmss.chinamobile.com>
 Liu Changcheng <changcheng.liu@intel.com> <changcheng.liu@aliyun.com>
+Yuan Lu <yuan.y.lu@intel.com>
 Liu Hong <liuhong@cmss.chinamobile.com>
 Liu Lei <liul124@chinaunicom.cn>
 Liu Peiyan <liu.peiyang@h3c.com>
diff --git a/.organizationmap b/.organizationmap
index da94c8fbdf30..79ece9b3d602 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -44,7 +44,6 @@ Alibaba <contact@alibaba-inc.com> Wentao Zhang <wentao.zwt@alibaba-inc.com>
 Alibaba <contact@alibaba-inc.com> Yan Lei <yongyou.yl@alibaba-inc.com>
 Alibaba <contact@alibaba-inc.com> Yanjiang Xu <yanjiang.xyj@alibaba-inc.com>
 Alibaba <contact@alibaba-inc.com> Yi Zhang <boqian.zy@alibaba-inc.com>
-Aliyun <contact@aliyun.com> Changcheng Liu <changcheng.liu@aliyun.com>
 Aliyun <contact@aliyun.com> Jeffrey Lu <lzhng2000@aliyun.com>
 Anchor Hosting <contact@anchor.com.au> Christian Marie <pingu@anchor.net.au>
 Anchor Hosting <contact@anchor.com.au> Sharif Olorin <sio@tesser.org>