From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 24 Apr 2017 16:54:20 +0000 (+0200)
Subject: mailmap: Yunfei Guan affiliation
X-Git-Tag: v12.1.0~184^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ba88ca7f693d24bb2326f718ca633a0d9be4b91c;p=ceph-ci.git

mailmap: Yunfei Guan affiliation

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

diff --git a/.mailmap b/.mailmap
index 06fcd9497de..802ba32bb0d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -465,6 +465,7 @@ Yehuda Sadeh <ysadehwe@redhat.com> <yehuda@redhat.com.>
 Yongqiang He <he.yongqiang@h3c.com>
 Yongyue Sun <abioy.sun@gmail.com>
 You Ji <youji@ebay.com>
+Yunfei Guan <yunfei.guan@xtaotech.com>
 Yuan Zhou <yuan.zhou@intel.com> <dunk007@gmail.com>
 Yunchuan Wen <yunchuan.wen@kylin-cloud.com> <yunchuanwen@ubuntukylin.com>
 Yuri Weinstein <yuriw@redhat.com> <yweinste@redhat.com>
diff --git a/.organizationmap b/.organizationmap
index 280ddea9d18..17464131aa3 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -767,6 +767,7 @@ XSky <contact@xsky.com> Mingxin Liu <mingxin@xsky.com>
 XSky <contact@xsky.com> Tianshan Qu <tianshan@xsky.com>
 XSky <contact@xsky.com> Xinze Chi <xinze@xsky.com>
 XSky <contact@xsky.com> Zhiqiang Wang <zhiqiang@xsky.com>
+XTao Co. Ltd. <contact@xtaotech.com> Yunfei Guan <yunfei.guan@xtaotech.com>
 Yahoo! <contact@yahoo-inc.com> Guang Yang <yguang@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Haifeng Liu <haifeng@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Lei Dong <leidong@yahoo-inc.com>