]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #25932 into master
authorSage Weil <sage@redhat.com>
Mon, 14 Jan 2019 20:08:25 +0000 (14:08 -0600)
committerSage Weil <sage@redhat.com>
Mon, 14 Jan 2019 20:08:25 +0000 (14:08 -0600)
commitff67c66ee6dda52daf867831bcdfc6ced4a0ebd9
treeda25cac40b998fd398a47f6fc62b10a8b531cfa1
parent20323cc29401ed4a55cfefccd360c7b94bfb2753
parent54c5202b741dac2d1a80226e0f6532595dbb554c
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>