From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 13 Feb 2020 23:21:30 +0000 (-0800)
Subject: Merge PR #33194 into master
X-Git-Tag: v15.1.1~424
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5c98a5fd7b6dcb402bbe09bc3926bdd1f838f436;p=ceph.git

Merge PR #33194 into master

* refs/pull/33194/head:
	qa: add tests for mds_join_fs cluster affinity
	qa: update cluster warning message for removed MDS
	doc: add section on new mds_join_fs behavior
	mon/MDSMonitor: enforce mds_join_fs cluster affinity
	mon/MDSMonitor: use type of info.rank or mds_rank_t
	qa: accept operation on current fs status
	qa: add method to enable multifs
	qa: fix nested generator use
	qa: manage config changes through mons

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

5c98a5fd7b6dcb402bbe09bc3926bdd1f838f436