]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14361 from ShiqiCooperation/master
authorHaomai Wang <haomaiwang@gmail.com>
Wed, 12 Apr 2017 07:41:29 +0000 (15:41 +0800)
committerGitHub <noreply@github.com>
Wed, 12 Apr 2017 07:41:29 +0000 (15:41 +0800)
mailmap: shiqi affiliation

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

Simple merge