]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32015 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 6 Jan 2020 20:29:39 +0000 (12:29 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 6 Jan 2020 20:29:50 +0000 (12:29 -0800)
* 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 <pdonnell@redhat.com>
1  2 
src/common/options.cc
src/mon/MDSMonitor.cc
src/pybind/mgr/cephadm/module.py

Simple merge
Simple merge
Simple merge