]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a804561 9aa25d7)
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)
commit7fde99ac06a52749268926be14c06fb0ddf0c2a9
treeb9eb854eb869106c35c55149eb566823309392batree | snapshot
parenta8045617957d43153f92592b6b80e31c62cba1d1commit | diff
parent9aa25d7df865f779d2a77680998bf9ac19e81f35commit | diff
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 <pdonnell@redhat.com>
src/common/options.cc diff1 | diff2 | blob | history
src/mon/MDSMonitor.cc diff1 | diff2 | blob | history
src/pybind/mgr/cephadm/module.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.