From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 4 May 2020 13:44:39 +0000 (-0700)
Subject: Merge PR #34088 into master
X-Git-Tag: v16.1.0~2433
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ec2fcf3035c95cff15c99cfb6c8cf268b299f704;p=ceph.git

Merge PR #34088 into master

* refs/pull/34088/head:
	doc: mailmap: changes for octopus release

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

ec2fcf3035c95cff15c99cfb6c8cf268b299f704