From: Loic Dachary <loic@dachary.org>
Date: Mon, 27 Jan 2014 05:40:05 +0000 (+0100)
Subject: mailmap: Ma Jianpeng affiliation
X-Git-Tag: v0.78~243^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93a62d73b7be12e32d77b0404e6dcc474c73d337;p=ceph.git

mailmap: Ma Jianpeng affiliation

and name normalization

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/.mailmap b/.mailmap
index 18ab0aafc710..ba6f655cd8c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -114,3 +114,4 @@ 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>
diff --git a/.organizationmap b/.organizationmap
index 3ddb6d044629..54937dfa0353 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -128,6 +128,7 @@ CISCO <contact@cisco.com> Kai Zhang <zakir.exe@gmail.com>
 Anchor Hosting <contact@anchor.com.au> Christian Marie <pingu@anchor.net.au>
 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>
 #
 # Local Variables:
 # compile-command: "git log --pretty='%aN <%aE>' | \