From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Mar 2020 02:56:20 +0000 (-0500)
Subject: Merge PR #33930 into octopus
X-Git-Tag: v15.1.1~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3b7787f5396ae1b8e9550ce5898c6f92aab1a987;p=ceph-ci.git

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>
---

3b7787f5396ae1b8e9550ce5898c6f92aab1a987