]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit3b7787f5396ae1b8e9550ce5898c6f92aab1a987
tree0c4d1028f63d40c0915eebb4cb4686ced49311f1
parentd5cd03207becc11e0c6645f30bda391996802bb4
parent0c62be9275e4b07e80190a81426263b6527f4420
Merge PR #33930 into octopus

* 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>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/orchestrator/module.py