From: Loic Dachary <loic@dachary.org>
Date: Wed, 30 Jul 2014 03:50:45 +0000 (+0600)
Subject: mailmap: Ma Jianpeng affiliation
X-Git-Tag: v0.85~88^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8e641574b9b0bf77d8c9512a0cf4c3d3d28b5a0;p=ceph.git

mailmap: Ma Jianpeng affiliation

and name normalization

Reviewed-by: Ma Jianpeng <jianpeng.ma@intel.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/.mailmap b/.mailmap
index 61d98dc2bddd..a29b46353b7d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -119,7 +119,8 @@ Huang Jun <hjwsm1989@gmail.com> huangjun <hjwsm1989@gmail.com>
 Ron Allred <rallred@itrefined.com> rallred <ron-github@neversleep.net>
 Dan Chai <tengweicai@gmail.com> danchai <tengweicai@gmail.com>
 Christian Marie <pingu@anchor.net.au> <christian@ponies.io>
-Ma Jianpeng <majianpeng@gmail.com> majianpeng <majianpeng@gmail.com>
+Ma Jianpeng <jianpeng.ma@intel.com> Ma, Jianpeng <jianpeng.ma@intel.com>
+Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
 Guang Yang <yguang@yahoo-inc.com> <guangyy@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index a416a38d3652..633bd8a2347d 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -112,6 +112,7 @@ SUSE <contact@suse.com> Hannes Reinecke <hare@suse.de>
 SUSE <contact@suse.com> David Disseldorp <ddiss@suse.de>
 Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
 Intel <contact@intel.com> Wang, Yaguang <yaguang.wang@intel.com>
+Intel <contact@intel.com> Ma Jianpeng <jianpeng.ma@intel.com>
 HGST <contact@hgst.com> Kevin Dalley <kevin@kelphead.org>
 HGST <contact@hgst.com> Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com>
 Cloudwatt <libre.licensing@cloudwatt.com> Loic Dachary <loic@dachary.org>
@@ -186,7 +187,6 @@ Anchor Hosting <contact@anchor.com.au> Christian Marie <pingu@anchor.net.au>
 Anchor Hosting <contact@anchor.com.au> Sharif Olorin <sio@tesser.org>
 Lebanon Evangelical School <contact@lesbg.com> Jonathan Dieter <jdieter@lesbg.com>
 Spectra Logic <contact@spectralogic.com> Alan Somers <asomers@gmail.com>
-Kedacom <contact@kedacom.com> Ma Jianpeng <majianpeng@gmail.com>
 Hostplex Hosting <contact@hostplex.net> Andras Elso <elso.andras@gmail.com>
 CCM Benchmark <contact@ccmbenchmark.com> Laurent Barbe <laurent@ksperis.com>
 Bayan <contact@bayan.co.ir> Mohammad Salehe <salehe+dev@gmail.com>