From: Haomai Wang <haomaiwang@gmail.com>
Date: Wed, 12 Apr 2017 07:41:29 +0000 (+0800)
Subject: Merge pull request #14361 from ShiqiCooperation/master
X-Git-Tag: v12.0.2~98
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b43c180189abfd82282650925fc680519abc8cfb;p=ceph.git

Merge pull request #14361 from ShiqiCooperation/master

mailmap: shiqi affiliation

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
---

b43c180189abfd82282650925fc680519abc8cfb