From: Sage Weil <sage@newdream.net>
Date: Fri, 16 Apr 2021 12:01:15 +0000 (-0400)
Subject: Merge PR #40711 into master
X-Git-Tag: v17.1.0~2230
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ae2cc1491204e3096df06ac669ca7e4fbbaece99;p=ceph.git

Merge PR #40711 into master

* refs/pull/40711/head:
	mgr/cephadm: fix nfs-rgw stray daemon

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
---

ae2cc1491204e3096df06ac669ca7e4fbbaece99