Merge pull request #17329 from xiexingguo/wip-21162

author Sage Weil <sage@newdream.net>

Tue, 29 Aug 2017 20:58:21 +0000 (15:58 -0500)

committer GitHub <noreply@github.com>

Tue, 29 Aug 2017 20:58:21 +0000 (15:58 -0500)
author Sage Weil <sage@newdream.net>
Tue, 29 Aug 2017 20:58:21 +0000 (15:58 -0500)
committer GitHub <noreply@github.com>
Tue, 29 Aug 2017 20:58:21 +0000 (15:58 -0500)
diff --cc qa/workunits/mon/crush_ops.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 29 Aug 2017 20:58:21 +0000 (15:58 -0500)
committer	GitHub <noreply@github.com>
	Tue, 29 Aug 2017 20:58:21 +0000 (15:58 -0500)
		1	2
qa/workunits/mon/crush_ops.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history