From: Patrick Donnelly Date: Tue, 25 Feb 2020 19:04:06 +0000 (-0800) Subject: Merge PR #32657 into master X-Git-Tag: v15.1.1~263 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1d3ed17dcb0082a57cfe720f7f03a76b16753e8c;p=ceph.git Merge PR #32657 into master * refs/pull/32657/head: test: query using mds id, not rank mgr: re-enable mds `scrub status` info in ceph status mon: filter out ceph normal ceph entity types when dumping service metadata mgr: filter out normal ceph services when processing service map mgr: helper function to check if a service is a normal ceph service Reviewed-by: Kefu Chai Reviewed-by: Patrick Donnelly --- 1d3ed17dcb0082a57cfe720f7f03a76b16753e8c