]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #28839 into master
authorSage Weil <sage@redhat.com>
Tue, 16 Jul 2019 15:07:53 +0000 (10:07 -0500)
committerSage Weil <sage@redhat.com>
Tue, 16 Jul 2019 15:07:53 +0000 (10:07 -0500)
* refs/pull/28839/head:
osd: support osd_repair_during_recovery

Reviewed-by: David Zafman <dzafman@redhat.com>
1  2 
qa/standalone/scrub/osd-scrub-repair.sh
src/common/options.cc
src/osd/OSD.cc

Simple merge
diff --cc src/osd/OSD.cc
Simple merge