summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoic Dachary <loic@dachary.org>2014-01-27 06:40:05 +0100
committerLoic Dachary <loic@dachary.org>2014-01-30 21:13:07 +0100
commit93a62d73b7be12e32d77b0404e6dcc474c73d337 (patch)
tree635fa209f8ebb4cfdef99c775abf06770b8b46e9
parentmailmap: Simon Leinen is with SWITCH (diff)
downloadceph-93a62d73b7be12e32d77b0404e6dcc474c73d337.tar.xz
ceph-93a62d73b7be12e32d77b0404e6dcc474c73d337.zip
mailmap: Ma Jianpeng affiliation
and name normalization Signed-off-by: Loic Dachary <loic@dachary.org>
-rw-r--r--.mailmap1
-rw-r--r--.organizationmap1
2 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 18ab0aafc71..ba6f655cd8c 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 3ddb6d04462..54937dfa035 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>' | \