Merge remote-tracking branch 'gh/wip-crush'

author Sage Weil <sage@inktank.com>

Mon, 25 Mar 2013 23:29:56 +0000 (16:29 -0700)

committer Sage Weil <sage@inktank.com>

Mon, 25 Mar 2013 23:29:56 +0000 (16:29 -0700)
author Sage Weil <sage@inktank.com>
Mon, 25 Mar 2013 23:29:56 +0000 (16:29 -0700)
committer Sage Weil <sage@inktank.com>
Mon, 25 Mar 2013 23:29:56 +0000 (16:29 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Mon, 25 Mar 2013 23:29:56 +0000 (16:29 -0700)
committer	Sage Weil <sage@inktank.com>
	Mon, 25 Mar 2013 23:29:56 +0000 (16:29 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history