From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 8 Feb 2017 11:00:21 +0000 (+0100)
Subject: mailmap: Fang Yuxiang affiliation
X-Git-Tag: v12.0.1~460^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=036ac75b598b140e11108d1fd23ed88d80179063;p=ceph.git

mailmap: Fang Yuxiang affiliation

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/.mailmap b/.mailmap
index 9b45c15904d..d58781835e1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -94,6 +94,8 @@ Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
 Esteban Molina-Estolano <eestolan@lanl.gov> <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
 Fangchen Sun <sunspot0105@gmail.com>
+Fang Yuxiang <fang.yuxiang@eisoo.com>
+Fang Yuxiang <fang.yuxiang@eisoo.com> <hrchu@users.noreply.github.com>
 Federico Gimenez <fgimenez@coit.es> <federico.gimenez@hola-internet.com>
 Feng Wang <cyclonew@cs.ucsc.edu> <cyclonew@29311d96-e01e-0410-9327-a35deaab8ce9>
 Feng Yu <amoxic@126.com>
diff --git a/.organizationmap b/.organizationmap
index 7327c97e802..c4e52ddbd3c 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -106,6 +106,7 @@ Ebay <contact@ebay.com> Emile Snyder <emsnyder@ebay.com>
 Endurance International Group <contact@endurance.com> Robert LeBlanc <robert.leblanc@endurance.com>
 eNovance <contact@enovance.com> Babu Shanmugam <anbu@enovance.com>
 eNovance <contact@enovance.com> Sebastien Han <sebastien.han@enovance.com>
+EISOO <contact@eisoo.com> Fang Yuxiang <fang.yuxiang@eisoo.com>
 Enproduktion GmbH <contact@produktion.io> Malte Fiala <maltefiala@produktion.io>
 EPAM <contact@epam.com> Andrey Kuznetsov <Andrey_Kuznetsov@epam.com>
 Exalead <contact@exalead.com> <roche+git@exalead.com>