]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbd7a1b acd43b8)
Merge pull request #36291 from dzafman/wip-46707-octopus
authorYuri Weinstein <yweinste@redhat.com>
Mon, 10 Aug 2020 17:18:14 +0000 (10:18 -0700)
committerGitHub <noreply@github.com>
Mon, 10 Aug 2020 17:18:14 +0000 (10:18 -0700)
octopus: osd: Cancel in-progress scrubs (not user requested)

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

diff --cc src/osd/OSD.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.