Merge pull request #6012 from liewegas/wip-mon

author Sage Weil <sage@redhat.com>

Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)

committer Sage Weil <sage@redhat.com>

Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)
author Sage Weil <sage@redhat.com>
Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)
committer Sage Weil <sage@redhat.com>
Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 25 Sep 2015 12:52:29 +0000 (08:52 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history