Merge pull request #16706 from jdurgin/wip-20850

author Sage Weil <sage@newdream.net>

Tue, 1 Aug 2017 19:12:01 +0000 (14:12 -0500)

committer GitHub <noreply@github.com>

Tue, 1 Aug 2017 19:12:01 +0000 (14:12 -0500)
author Sage Weil <sage@newdream.net>
Tue, 1 Aug 2017 19:12:01 +0000 (14:12 -0500)
committer GitHub <noreply@github.com>
Tue, 1 Aug 2017 19:12:01 +0000 (14:12 -0500)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 1 Aug 2017 19:12:01 +0000 (14:12 -0500)
committer	GitHub <noreply@github.com>
	Tue, 1 Aug 2017 19:12:01 +0000 (14:12 -0500)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history