From: Loic Dachary <loic@dachary.org>
Date: Fri, 2 May 2014 22:35:04 +0000 (+0200)
Subject: mailmap: Guang Yang name normalization
X-Git-Tag: v0.81~81^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b192f7db28846cd1ff1a9dd91199c3c78ecf31a;p=ceph.git

mailmap: Guang Yang name normalization

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

diff --git a/.mailmap b/.mailmap
index d2ab06d07388..aea4c8046eda 100644
--- a/.mailmap
+++ b/.mailmap
@@ -122,5 +122,6 @@ Ma Jianpeng <majianpeng@gmail.com> majianpeng <majianpeng@gmail.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
 Guang Yang <yguang@yahoo-inc.com> <guangyy@gmail.com>
+Guang Yang <yguang@yahoo-inc.com> Guang Yang <yguang@caughtrealize-dl-vm0.peking.corp.yahoo.com>
 Tyler Brekke <tyler.brekke@inktank.com> Concubidated <tyler.brekke@inktank.com>
 Huang Jun <hjwsm1989@gmail.com> huang jun <hjwsm1989@gmail.com>