From: Kefu Chai <tchaikov@gmail.com>
Date: Thu, 2 Mar 2017 09:00:48 +0000 (+0800)
Subject: Merge pull request #13427 from ly798/update-info
X-Git-Tag: v12.0.1~205
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a15e5045ff6d89efc021cd388bb8b049dd1ca560;p=ceph.git

Merge pull request #13427 from ly798/update-info

mailmap: Liu Yang affiliation

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

a15e5045ff6d89efc021cd388bb8b049dd1ca560