Merge PR #28839 into master

author Sage Weil <sage@redhat.com>

Tue, 16 Jul 2019 15:07:53 +0000 (10:07 -0500)

committer Sage Weil <sage@redhat.com>

Tue, 16 Jul 2019 15:07:53 +0000 (10:07 -0500)
author Sage Weil <sage@redhat.com>
Tue, 16 Jul 2019 15:07:53 +0000 (10:07 -0500)
committer Sage Weil <sage@redhat.com>
Tue, 16 Jul 2019 15:07:53 +0000 (10:07 -0500)
diff --cc qa/standalone/scrub/osd-scrub-repair.sh
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 16 Jul 2019 15:07:53 +0000 (10:07 -0500)
committer	Sage Weil <sage@redhat.com>
	Tue, 16 Jul 2019 15:07:53 +0000 (10:07 -0500)
		1	2
qa/standalone/scrub/osd-scrub-repair.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history