From: Sage Weil <sage@newdream.net>
Date: Tue, 23 Mar 2021 00:20:30 +0000 (-0500)
Subject: Merge PR #40279 into pacific
X-Git-Tag: v16.2.0~74
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3759ce9832c41a94bccaa8bfa95b8130990d501d;p=ceph.git

Merge PR #40279 into pacific

* refs/pull/40279/head:
	mgr/cephadm: identify rgw, cepfs-mirror in servicemap
	mgr/ServiceMap: adjust 'ceph -s' summary
	rgw: register daemons in servicemap by gid; include id
	cephadm: fix rbd-mirror auth name

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

3759ce9832c41a94bccaa8bfa95b8130990d501d