From: Sage Weil <sage@newdream.net>
Date: Sat, 20 Mar 2021 13:15:58 +0000 (-0400)
Subject: Merge PR #40220 into master
X-Git-Tag: v17.1.0~2545
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9f97045a2e639e63ed7c72c5295b278a8ca9926;p=ceph.git

Merge PR #40220 into master

* refs/pull/40220/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: Casey Bodley <cbodley@redhat.com>
---

c9f97045a2e639e63ed7c72c5295b278a8ca9926