From: Sage Weil <sage@redhat.com>
Date: Fri, 9 Nov 2018 20:53:56 +0000 (-0600)
Subject: Merge PR #24806 into master
X-Git-Tag: v14.1.0~948
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=919aa37f821c6afb0782765a8185f3fd791130ea;p=ceph.git

Merge PR #24806 into master

* refs/pull/24806/head:
	os/filestore: fix merge_collection replay guards

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

919aa37f821c6afb0782765a8185f3fd791130ea