From: Loic Dachary <loic@dachary.org>
Date: Thu, 22 May 2014 14:23:51 +0000 (+0200)
Subject: mailmap: Florent Flament affiliation
X-Git-Tag: v0.82~39^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d1a49377b8ec1b951911ba7355ffb0aa2a15d0d;p=ceph.git

mailmap: Florent Flament affiliation

and name normalization

Reviewed-by: Florent Flament <florent.flament@cloudwatt.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/.mailmap b/.mailmap
index 91573b5405c2..83b3d85f79cf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -127,3 +127,4 @@ Tyler Brekke <tyler.brekke@inktank.com> Concubidated <tyler.brekke@inktank.com>
 Huang Jun <hjwsm1989@gmail.com> huang jun <hjwsm1989@gmail.com>
 Warren Usui <warren.usui@inktank.com> wusui <warren.usui@inktank.com>
 Florent Bautista <florent@coppint.com> FlorentCoppint <florent@coppint.com>
+Florent Flament <florent.flament@cloudwatt.com> <florent.flament-ext@cloudwatt.com>
diff --git a/.organizationmap b/.organizationmap
index b2b06d559dff..0ff313823344 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -80,6 +80,7 @@ Intel <contact@intel.com> Wang, Yaguang <yaguang.wang@intel.com>
 Cloudwatt <libre.licensing@cloudwatt.com> Loic Dachary <loic@dachary.org>
 Cloudwatt <libre.licensing@cloudwatt.com> Christophe Courtaut <christophe.courtaut@gmail.com>
 Cloudwatt <libre.licensing@cloudwatt.com> Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
+Cloudwatt <libre.licensing@cloudwatt.com> Florent Flament <florent.flament@cloudwatt.com>
 Wido 42on <contact@42on.com> Wido den Hollander <wido@42on.com>
 eNovance <contact@enovance.com> Babu Shanmugam <anbu@enovance.com>
 eNovance <contact@enovance.com> Sebastien Han <sebastien.han@enovance.com>