Merge pull request #16614 from neha-ojha/recovery_sleep_hybrid

author Sage Weil <sage@newdream.net>

Fri, 4 Aug 2017 18:23:38 +0000 (13:23 -0500)

committer GitHub <noreply@github.com>

Fri, 4 Aug 2017 18:23:38 +0000 (13:23 -0500)
author Sage Weil <sage@newdream.net>
Fri, 4 Aug 2017 18:23:38 +0000 (13:23 -0500)
committer GitHub <noreply@github.com>
Fri, 4 Aug 2017 18:23:38 +0000 (13:23 -0500)
diff --cc src/common/options.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 4 Aug 2017 18:23:38 +0000 (13:23 -0500)
committer	GitHub <noreply@github.com>
	Fri, 4 Aug 2017 18:23:38 +0000 (13:23 -0500)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history