summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorLoic Dachary <loic@dachary.org>2014-02-07 17:33:39 +0100
committerLoic Dachary <loic@dachary.org>2014-02-08 14:10:49 +0100
commit17c8a230b8273c446db1ccce2bf7a77f93e7c0fd (patch)
tree537e6271eea498a5a679f961dcb97888030f9d35 /.mailmap
parentmailmap: Ray Lv is with Yahoo! (diff)
downloadceph-17c8a230b8273c446db1ccce2bf7a77f93e7c0fd.tar.xz
ceph-17c8a230b8273c446db1ccce2bf7a77f93e7c0fd.zip
mailmap: Yan, Zheng name normalization
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 ba6f655cd8c..93e86bfdd7d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -105,6 +105,7 @@ Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gm
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>
+Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>