]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit1b46267cf798a5a99e62e7aa482436e609de3f81
tree2f5b6bc5340b0dd0268b1a1b93123a1b497a3d78
parentbb72ea8eabffc0818f46f87103b5937e5e894949
parent80f4e1f677fc67fa8e14d29623b7593cf32ad918
Merge PR #28839 into master

* refs/pull/28839/head:
osd: support osd_repair_during_recovery

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