]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #28855 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 23 Aug 2019 23:16:16 +0000 (16:16 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 23 Aug 2019 23:16:16 +0000 (16:16 -0700)
* refs/pull/28855/head:
doc: document scrub summary in ceph status output
test: extend scrub control test to validate mds task status
mds: send scrub state changes to cluster log.
mds: periodically sent mds scrub status to ceph manager
mgr, mon: allow normal ceph services to register with manager

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
qa/tasks/ceph_manager.py
src/common/options.cc
src/mon/Monitor.cc

Simple merge
Simple merge
Simple merge