Merge pull request #11498 from liewegas/wip-stop-at-jewel

author Sage Weil <sage@redhat.com>

Sat, 5 Nov 2016 02:24:50 +0000 (21:24 -0500)

committer GitHub <noreply@github.com>

Sat, 5 Nov 2016 02:24:50 +0000 (21:24 -0500)
author Sage Weil <sage@redhat.com>
Sat, 5 Nov 2016 02:24:50 +0000 (21:24 -0500)
committer GitHub <noreply@github.com>
Sat, 5 Nov 2016 02:24:50 +0000 (21:24 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 5 Nov 2016 02:24:50 +0000 (21:24 -0500)
committer	GitHub <noreply@github.com>
	Sat, 5 Nov 2016 02:24:50 +0000 (21:24 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history