From: Sage Weil <sage@redhat.com>
Date: Mon, 30 Mar 2020 13:36:44 +0000 (-0500)
Subject: Merge PR #34260 into master
X-Git-Tag: v16.1.0~2744
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=07d9231ffbf4a56c35a80204c41d891790a01e17;p=ceph.git

Merge PR #34260 into master

* refs/pull/34260/head:
	Revert "Merge PR #34091 into master"

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

07d9231ffbf4a56c35a80204c41d891790a01e17