From: Sage Weil <sage@redhat.com>
Date: Sat, 22 Feb 2020 18:05:55 +0000 (-0600)
Subject: Merge PR #33091 into master
X-Git-Tag: v15.1.1~304
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5afec0fbfbaa4ace0d9ff1e94dac2730bc29ec07;p=ceph.git

Merge PR #33091 into master

* refs/pull/33091/head:
	qa/suites/rados: disable device scraping
	qa/standalone/ceph-helpers: disable device monitoring
	qa/tasks/ceph.py: add pre-mgr-commands option for ceph task
	mgr/devicehealth: set default monitoring to 'on'

Reviewed-by: Sage Weil <sage@redhat.com>
---

5afec0fbfbaa4ace0d9ff1e94dac2730bc29ec07