From: Sage Weil <sage@redhat.com>
Date: Wed, 18 Mar 2020 13:13:56 +0000 (-0500)
Subject: Merge PR #34013 into octopus
X-Git-Tag: v15.2.0~29
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1e256805524b420e3d44f85b5fb743f8e8702be9;p=ceph.git

Merge PR #34013 into octopus

* refs/pull/34013/head:
	qa/workunits/cephadm/test_cephadm: --skip-monitoring-stack

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

1e256805524b420e3d44f85b5fb743f8e8702be9