]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commitae2cc1491204e3096df06ac669ca7e4fbbaece99
treea5b31c6b8b373ea1b8c1a27cc2c298e53da5173c
parentaf3233864aea19218553ad915f4d9212612008f1
parentf94e0baf9e1897f803160eff8ba36df57aa433ac
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>
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/tests/test_cephadm.py