From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 30 Oct 2019 19:22:48 +0000 (-0700)
Subject: Merge PR #31231 into master
X-Git-Tag: v15.1.0~1103
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35b0b52153206fd6178afe584a2cd9c0ef2bcc05;p=ceph.git

Merge PR #31231 into master

* refs/pull/31231/head:
	qa: add tests for CephFS admin commands
	mds/MDSRank: report state to mgr as mds id, not rank

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

35b0b52153206fd6178afe584a2cd9c0ef2bcc05