]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #27092 into master
authorSage Weil <sage@redhat.com>
Thu, 21 Mar 2019 12:22:06 +0000 (07:22 -0500)
committerSage Weil <sage@redhat.com>
Thu, 21 Mar 2019 12:22:06 +0000 (07:22 -0500)
* refs/pull/27092/head:
mailmap: sort entries
mailmap: sort organizationmap
mailmap: updates for nautilus
doc: mailmap updates for mimic
mailmap fixes for 12.2.0

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge