From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Jan 2020 22:17:39 +0000 (-0600)
Subject: Merge PR #32795 into master
X-Git-Tag: v15.1.0~77
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84b679ffe7e561fda2555e4f7c057cfc380578f2;p=ceph.git

Merge PR #32795 into master

* refs/pull/32795/head:
	cephadm: require fsid if name contains a daemon id
	cephadm: infer the fsid by name

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

84b679ffe7e561fda2555e4f7c057cfc380578f2