Merge pull request #7964 from liewegas/wip-crush-jewel

author Sage Weil <sage@redhat.com>

Mon, 14 Mar 2016 14:51:40 +0000 (10:51 -0400)

committer Sage Weil <sage@redhat.com>

Mon, 14 Mar 2016 14:51:40 +0000 (10:51 -0400)
author Sage Weil <sage@redhat.com>
Mon, 14 Mar 2016 14:51:40 +0000 (10:51 -0400)
committer Sage Weil <sage@redhat.com>
Mon, 14 Mar 2016 14:51:40 +0000 (10:51 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 14 Mar 2016 14:51:40 +0000 (10:51 -0400)
committer	Sage Weil <sage@redhat.com>
	Mon, 14 Mar 2016 14:51:40 +0000 (10:51 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history