From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Mar 2020 16:07:36 +0000 (-0500)
Subject: Merge PR #33832 into octopus
X-Git-Tag: v15.1.1~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68bba3ffb7964547a21d6e21b78814bee888d16a;p=ceph.git

Merge PR #33832 into octopus

* refs/pull/33832/head:
	Revert "Merge pull request #33673 from cbodley/wip-denc-enum"

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

68bba3ffb7964547a21d6e21b78814bee888d16a