From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 22 Aug 2020 01:41:35 +0000 (-0700)
Subject: Merge PR #36632 into master
X-Git-Tag: v16.1.0~1362
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa150dc35fae35f83ddd7ed2c568afd8431bb662;p=ceph.git

Merge PR #36632 into master

* refs/pull/36632/head:
	mds: standy-replay mds remained in the "resolve" state after restart the active mds

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

aa150dc35fae35f83ddd7ed2c568afd8431bb662