From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Nov 2019 17:22:27 +0000 (-0600)
Subject: Merge PR #31790 into master
X-Git-Tag: v15.1.0~793
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47514d5154e1b29494330a1c2fc0b26fd5cb843e;p=ceph.git

Merge PR #31790 into master

* refs/pull/31790/head:
	Revert "Merge pull request #16715 from adamemerson/wip-I-Object!"

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

47514d5154e1b29494330a1c2fc0b26fd5cb843e