Merge pull request #17196 from theanalyst/wip-21051-luminous

author Sage Weil <sage@newdream.net>

Thu, 24 Aug 2017 17:40:26 +0000 (12:40 -0500)

committer GitHub <noreply@github.com>

Thu, 24 Aug 2017 17:40:26 +0000 (12:40 -0500)
author Sage Weil <sage@newdream.net>
Thu, 24 Aug 2017 17:40:26 +0000 (12:40 -0500)
committer GitHub <noreply@github.com>
Thu, 24 Aug 2017 17:40:26 +0000 (12:40 -0500)
diff --cc qa/standalone/scrub/osd-scrub-repair.sh
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 24 Aug 2017 17:40:26 +0000 (12:40 -0500)
committer	GitHub <noreply@github.com>
	Thu, 24 Aug 2017 17:40:26 +0000 (12:40 -0500)
		1	2
qa/standalone/scrub/osd-scrub-repair.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history