From: Sage Weil <sage@redhat.com>
Date: Mon, 14 Jan 2019 20:08:25 +0000 (-0600)
Subject: Merge PR #25932 into master
X-Git-Tag: v14.1.0~395
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff67c66ee6dda52daf867831bcdfc6ced4a0ebd9;p=ceph.git

Merge PR #25932 into master

* refs/pull/25932/head:
	qa/tasks/ceph: stop any split/merge activity before scrubbing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

ff67c66ee6dda52daf867831bcdfc6ced4a0ebd9