From: Sage Weil <sage@redhat.com>
Date: Wed, 24 Oct 2018 15:31:15 +0000 (-0500)
Subject: Merge PR #24687 into master
X-Git-Tag: v14.1.0~1106
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ff2a1a44eedc978fec0e2172b9ae57ae0fe43a4;p=ceph.git

Merge PR #24687 into master

* refs/pull/24687/head:
	src/test: fix unordered manifest-unset op

Reviewed-by: Sage Weil <sage@redhat.com>
---

2ff2a1a44eedc978fec0e2172b9ae57ae0fe43a4