summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLoic Dachary <loic@dachary.org>2014-01-09 13:48:44 +0100
committerLoic Dachary <loic@dachary.org>2014-01-09 13:49:15 +0100
commit2de21486f9cda65433932c04a4e4063ba65f70ea (patch)
tree212d1edea8626989a22bc9d3be13542608424dc6 /.mailmap
parentmailmap: add Loic Dachary fixes for Reviewed-by: (diff)
downloadceph-2de21486f9cda65433932c04a4e4063ba65f70ea.tar.xz
ceph-2de21486f9cda65433932c04a4e4063ba65f70ea.zip
mailmap: add Yan Zheng fixes for Reviewed-by:
Signed-off-by: Loic Dachary <loic@dachary.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 0ca430b7972..9395d5fd911 100644
--- a/.mailmap
+++ b/.mailmap
@@ -98,3 +98,4 @@ Matthew Wodrich <matthew.wodrich@dreamhost.com> <mattheww@Mattsbox.(none)>
Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gmail.com>
Loic Dachary <loic@dachary.org> <loic@dachary.com>
Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
+Yan, Zheng <zheng.z.yan@intel.com> Zheng, Yan <zheng.z.yan@intel.com>