]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commitc950df44f31c6da06063e9ee9d13ed859125274b
treee68425d3cf78a9d5f0611188f314f948e0743cd0
parentedb1ad8ee5c7223150690b395414ccab10b3adf9
parente0cfad08b670affd3468be4eabccd7d5d8285cf8
Merge PR #36139 into master

* 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>