Merge pull request #13507 from shinobu-x/wip-18468-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Tue, 1 Aug 2017 11:06:54 +0000 (13:06 +0200)

committer GitHub <noreply@github.com>

Tue, 1 Aug 2017 11:06:54 +0000 (13:06 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Tue, 1 Aug 2017 11:06:54 +0000 (13:06 +0200)
committer GitHub <noreply@github.com>
Tue, 1 Aug 2017 11:06:54 +0000 (13:06 +0200)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Tue, 1 Aug 2017 11:06:54 +0000 (13:06 +0200)
committer	GitHub <noreply@github.com>
	Tue, 1 Aug 2017 11:06:54 +0000 (13:06 +0200)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history