Merge remote-tracking branch 'gh/wip-mon-report' into next

author Sage Weil <sage@inktank.com>

Mon, 15 Jul 2013 21:23:40 +0000 (14:23 -0700)

committer Sage Weil <sage@inktank.com>

Mon, 15 Jul 2013 21:23:40 +0000 (14:23 -0700)
author Sage Weil <sage@inktank.com>
Mon, 15 Jul 2013 21:23:40 +0000 (14:23 -0700)
committer Sage Weil <sage@inktank.com>
Mon, 15 Jul 2013 21:23:40 +0000 (14:23 -0700)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/Paxos.cc
Simple merge
diff --cc src/mon/Paxos.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Mon, 15 Jul 2013 21:23:40 +0000 (14:23 -0700)
committer	Sage Weil <sage@inktank.com>
	Mon, 15 Jul 2013 21:23:40 +0000 (14:23 -0700)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Paxos.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Paxos.h	patch \|	diff1 \|	diff2 \|	blob \| history