summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLoic Dachary <ldachary@redhat.com>2014-11-07 23:54:07 +0100
committerLoic Dachary <ldachary@redhat.com>2014-11-07 23:54:07 +0100
commita21bca1d466ebb80df741cb1618db580f91b0774 (patch)
tree7c9546632f8f80c75d7480edd33d3d7e0c108bcf /.mailmap
parentMerge pull request #2882 from ceph/wip-doc-dumpling-to-firefly (diff)
downloadceph-a21bca1d466ebb80df741cb1618db580f91b0774.tar.xz
ceph-a21bca1d466ebb80df741cb1618db580f91b0774.zip
mailmap: Loic Dachary affiliation
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 8f826b2a1b5..99db5c8b62f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -93,8 +93,9 @@ Josh Durgin <josh.durgin@inktank.com> <josh.durgin@dreamhost.com>
Kacper Kowalik <xarthisius@gentoo.org> Kacper Kowalik (Xarthisius) <xarthisius@gentoo.org>
Laszlo Boszormenyi <gcs@debian.hu> Laszlo Boszormenyi (GCS) <gcs@debian.hu>
Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com> <lluis@pamies.cat>
-Loic Dachary <loic@dachary.org> <loic@dachary.com>
-Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
+Loic Dachary <ldachary@redhat.com> <loic@dachary.com>
+Loic Dachary <ldachary@redhat.com> <loic@dachary.org>
+Loic Dachary <ldachary@redhat.com> Loïc Dachary <loic@dachary.org>
Ma Jianpeng <jianpeng.ma@intel.com> <majianpeng@gmail.com>
Ma Jianpeng <jianpeng.ma@intel.com> Ma, Jianpeng <jianpeng.ma@intel.com>
Ma Jianpeng <jianpeng.ma@intel.com> Jianpeng Ma <jianpeng.ma@intel.com>