Merge pull request #18025 from liewegas/wip-recovery-preemption-luminous

author Sage Weil <sage@newdream.net>

Wed, 11 Oct 2017 17:20:04 +0000 (12:20 -0500)

committer GitHub <noreply@github.com>

Wed, 11 Oct 2017 17:20:04 +0000 (12:20 -0500)
author Sage Weil <sage@newdream.net>
Wed, 11 Oct 2017 17:20:04 +0000 (12:20 -0500)
committer GitHub <noreply@github.com>
Wed, 11 Oct 2017 17:20:04 +0000 (12:20 -0500)
diff --cc src/mon/PGMap.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 11 Oct 2017 17:20:04 +0000 (12:20 -0500)
committer	GitHub <noreply@github.com>
	Wed, 11 Oct 2017 17:20:04 +0000 (12:20 -0500)
		1	2
src/mon/PGMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history