From: Sage Weil <sage@newdream.net>
Date: Fri, 5 Mar 2021 20:33:38 +0000 (-0500)
Subject: Merge PR #39855 into master
X-Git-Tag: v17.1.0~2723
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a27e8a4868784656cb0fce8b562d6533ae240940;p=ceph.git

Merge PR #39855 into master

* refs/pull/39855/head:
	qa/suites/rgw/singleton: add trivial cephadm case
	Revert "rgw: register daemon in service map with more details"

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

a27e8a4868784656cb0fce8b562d6533ae240940