From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Fri, 4 Mar 2016 15:13:27 +0000 (+0100)
Subject: mailmap: Yankun Li affiliation
X-Git-Tag: v10.1.0~36^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=337ea900af99c83a38a67ea41ded979b97d1956c;p=ceph.git

mailmap: Yankun Li affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/.mailmap b/.mailmap
index 185d5b86617e..29430d307df3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -322,6 +322,7 @@ Xinze Chi <xinze@xsky.com>
 Xinze Chi <xinze@xsky.com> <xmdxcxz@gmail.com>
 Xuan Liu <liu.xuan@h3c.com>
 Yannick Atchy Dalama <yannick.atchy.dalama@gmail.com>
+Yankun Li <liyankun@unitedstack.com> <YankunLi@users.noreply.github.com>
 Yan, Zheng <zheng.z.yan@intel.com>
 Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
 Yehua Chen <chen.yehua@h3c.com>
diff --git a/.organizationmap b/.organizationmap
index 4a5e9954328a..ea7bb50109e3 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -503,7 +503,6 @@ Unaffiliated <no@organization.net> Xie Rui <875016668@qq.com>
 Unaffiliated <no@organization.net> Xingyi Wu <wuxingyi2015@outlook.com>
 Unaffiliated <no@organization.net> Xinze Chi <xmdxcxz@gmail.com>
 Unaffiliated <no@organization.net> Xiong Yiliang <xiongyiliang@xunlei.com>
-Unaffiliated <no@organization.net> YankunLi <YankunLi@users.noreply.github.com>
 Unaffiliated <no@organization.net> Yann Dupont <yann@objoo.org>
 Unaffiliated <no@organization.net> Yannick Atchy Dalama <yannick.atchy.dalama@gmail.com>
 Unaffiliated <no@organization.net> YiQiang Chen <cyqsign@163.com>
@@ -517,6 +516,7 @@ UnitedStack <contact@unitedstack.com> Guangliang Zhao <guangliang@unitedstack.co
 UnitedStack <contact@unitedstack.com> Jevon Qiao <qiaojianfeng@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
 UnitedStack <contact@unitedstack.com> Li Tianqing <tianqing@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>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Carlos Maltzahn <carlosm@cs.ucsc.edu>