]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edb1ad8 e0cfad0)
Merge PR #36139 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:17:30 +0000 (20:17 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:17:30 +0000 (20:17 -0700)
* refs/pull/36139/head:
mon: refactor ServiceMap::Service::get_task_summary()
mon: only dump non-empty "task status"
mgr/ServiceMap: move ServiceMap::Daemon implementation into .cc file

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.