From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 5 May 2021 01:00:27 +0000 (-0700)
Subject: Merge PR #41160 into master
X-Git-Tag: v17.1.0~2075
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c569e7f302c3f5f5e4d870b60f968c52e690429;p=ceph.git

Merge PR #41160 into master

* refs/pull/41160/head:
	Revert "Merge PR #41134 into master"

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

2c569e7f302c3f5f5e4d870b60f968c52e690429