Merge branch 'next'

author Sage Weil <sage@inktank.com>

Mon, 8 Jul 2013 04:20:34 +0000 (21:20 -0700)

committer Sage Weil <sage@inktank.com>

Mon, 8 Jul 2013 04:20:34 +0000 (21:20 -0700)
author Sage Weil <sage@inktank.com>
Mon, 8 Jul 2013 04:20:34 +0000 (21:20 -0700)
committer Sage Weil <sage@inktank.com>
Mon, 8 Jul 2013 04:20:34 +0000 (21:20 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Mon, 8 Jul 2013 04:20:34 +0000 (21:20 -0700)
committer	Sage Weil <sage@inktank.com>
	Mon, 8 Jul 2013 04:20:34 +0000 (21:20 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history