From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 11 May 2018 21:57:42 +0000 (-0700)
Subject: Merge PR #21883 into master
X-Git-Tag: v14.0.0~148
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1b73c0154cb413ccd321aeaeba3be6d66158ee06;p=ceph-ci.git

Merge PR #21883 into master

* refs/pull/21883/head:
	mds: tighten conditions of calling rejoin_gather_finish()
	mds: avoid calling rejoin_gather_finish() two times successively

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

1b73c0154cb413ccd321aeaeba3be6d66158ee06