]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20323cc 54c5202)
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)
* refs/pull/25932/head:
qa/tasks/ceph: stop any split/merge activity before scrubbing

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.