From: Patrick Donnelly Date: Mon, 6 Jan 2020 20:29:39 +0000 (-0800) Subject: Merge PR #32015 into master X-Git-Tag: v15.1.0~325 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7fde99ac06a52749268926be14c06fb0ddf0c2a9;p=ceph.git Merge PR #32015 into master * refs/pull/32015/head: doc/cephfs/standby: document mds_join_fs mgr/cephadm: map mds daemons to a particular fs mon/MDSMonitor: respect mfs fscid preference mon/MDSMonitor: assign standbys to their preferred fscid mds/FSMap: track preferred fscid for standby daemons mds: add mds_join_fs option; pass via MMDSBeacon Reviewed-by: Patrick Donnelly --- 7fde99ac06a52749268926be14c06fb0ddf0c2a9