Merge pull request #16518 from liewegas/wip-20751

author Sage Weil <sage@newdream.net>

Mon, 24 Jul 2017 13:57:39 +0000 (08:57 -0500)

committer GitHub <noreply@github.com>

Mon, 24 Jul 2017 13:57:39 +0000 (08:57 -0500)
author Sage Weil <sage@newdream.net>
Mon, 24 Jul 2017 13:57:39 +0000 (08:57 -0500)
committer GitHub <noreply@github.com>
Mon, 24 Jul 2017 13:57:39 +0000 (08:57 -0500)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 24 Jul 2017 13:57:39 +0000 (08:57 -0500)
committer	GitHub <noreply@github.com>
	Mon, 24 Jul 2017 13:57:39 +0000 (08:57 -0500)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history