From: Loic Dachary <loic@dachary.org>
Date: Thu, 18 May 2017 10:06:50 +0000 (+0200)
Subject: Merge pull request #15145 from zealoussnow/wip-0518
X-Git-Tag: v12.1.0~10^2~86
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7e65938ab0352871e05c8a862b841e6f999fd50;p=ceph.git

Merge pull request #15145 from zealoussnow/wip-0518

mailmap: Leo Zhang infomation and affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
---

b7e65938ab0352871e05c8a862b841e6f999fd50