Merge pull request #29748 from dzafman/wip-40840

author Yuri Weinstein <yweinste@redhat.com>

Wed, 13 Nov 2019 20:13:33 +0000 (12:13 -0800)

committer GitHub <noreply@github.com>

Wed, 13 Nov 2019 20:13:33 +0000 (12:13 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 13 Nov 2019 20:13:33 +0000 (12:13 -0800)
committer GitHub <noreply@github.com>
Wed, 13 Nov 2019 20:13:33 +0000 (12:13 -0800)
diff --cc qa/standalone/scrub/osd-scrub-repair.sh
Simple merge
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 13 Nov 2019 20:13:33 +0000 (12:13 -0800)
committer	GitHub <noreply@github.com>
	Wed, 13 Nov 2019 20:13:33 +0000 (12:13 -0800)
		1	2
qa/standalone/scrub/osd-scrub-repair.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history