Merge remote-tracking branch 'gh/firefly'

author Sage Weil <sage@inktank.com>

Fri, 14 Mar 2014 15:30:04 +0000 (08:30 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 14 Mar 2014 15:30:04 +0000 (08:30 -0700)
author Sage Weil <sage@inktank.com>
Fri, 14 Mar 2014 15:30:04 +0000 (08:30 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 14 Mar 2014 15:30:04 +0000 (08:30 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 14 Mar 2014 15:30:04 +0000 (08:30 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 14 Mar 2014 15:30:04 +0000 (08:30 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history