]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40711 into master
authorSage Weil <sage@newdream.net>
Fri, 16 Apr 2021 12:01:15 +0000 (08:01 -0400)
committerSage Weil <sage@newdream.net>
Fri, 16 Apr 2021 12:01:15 +0000 (08:01 -0400)
* 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>
1  2 
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/tests/test_cephadm.py

Simple merge