]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #32795 into master
authorSage Weil <sage@redhat.com>
Thu, 23 Jan 2020 22:17:39 +0000 (16:17 -0600)
committerSage Weil <sage@redhat.com>
Thu, 23 Jan 2020 22:17:39 +0000 (16:17 -0600)
* 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>
1  2 
src/cephadm/cephadm

Simple merge