From: Sage Weil <sage@redhat.com>
Date: Thu, 21 Mar 2019 12:22:06 +0000 (-0500)
Subject: Merge PR #27092 into master
X-Git-Tag: v15.0.0~162
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=eb5e39ea0805e7a125e91e9eb91bd8b9098ce440;p=ceph-ci.git

Merge PR #27092 into master

* 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>
---

eb5e39ea0805e7a125e91e9eb91bd8b9098ce440