Merge pull request #11874 from wido/osd-no-scrub-recovery

author Sage Weil <sage@redhat.com>

Sat, 12 Nov 2016 13:35:13 +0000 (07:35 -0600)

committer GitHub <noreply@github.com>

Sat, 12 Nov 2016 13:35:13 +0000 (07:35 -0600)
author Sage Weil <sage@redhat.com>
Sat, 12 Nov 2016 13:35:13 +0000 (07:35 -0600)
committer GitHub <noreply@github.com>
Sat, 12 Nov 2016 13:35:13 +0000 (07:35 -0600)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 12 Nov 2016 13:35:13 +0000 (07:35 -0600)
committer	GitHub <noreply@github.com>
	Sat, 12 Nov 2016 13:35:13 +0000 (07:35 -0600)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history