From: Sage Weil <sage@redhat.com>
Date: Mon, 9 Jul 2018 14:50:16 +0000 (-0500)
Subject: Merge PR #22920 into jewel
X-Git-Tag: v10.2.11~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6188abd34ddd7bc895156ea50d6772bea5595332;p=ceph.git

Merge PR #22920 into jewel

* refs/pull/22920/head:
	Revert "Merge pull request #17893 from dzafman/wip-19140-19224"

Reviewed-by: David Zafman <dzafman@redhat.com>
---

6188abd34ddd7bc895156ea50d6772bea5595332