Merge branch 'next'

author Sage Weil <sage@inktank.com>

Fri, 22 Mar 2013 16:15:52 +0000 (09:15 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 22 Mar 2013 16:15:52 +0000 (09:15 -0700)
author Sage Weil <sage@inktank.com>
Fri, 22 Mar 2013 16:15:52 +0000 (09:15 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 22 Mar 2013 16:15:52 +0000 (09:15 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/AuthMonitor.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 22 Mar 2013 16:15:52 +0000 (09:15 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 22 Mar 2013 16:15:52 +0000 (09:15 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/AuthMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history