]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33930 into octopus
authorSage Weil <sage@redhat.com>
Fri, 13 Mar 2020 02:56:20 +0000 (21:56 -0500)
committerSage Weil <sage@redhat.com>
Fri, 13 Mar 2020 02:56:20 +0000 (21:56 -0500)
* refs/pull/33930/head:
mgr/cephadm: implement pause/resume to suspect non-monitoring background work
mgr/orch: add pause/resume hooks

Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/orchestrator/module.py

Simple merge
Simple merge