Merge pull request #2237 from ceph/wip-8560

author Sage Weil <sage@inktank.com>

Wed, 13 Aug 2014 04:06:16 +0000 (21:06 -0700)

committer Sage Weil <sage@inktank.com>

Wed, 13 Aug 2014 04:06:16 +0000 (21:06 -0700)
author Sage Weil <sage@inktank.com>
Wed, 13 Aug 2014 04:06:16 +0000 (21:06 -0700)
committer Sage Weil <sage@inktank.com>
Wed, 13 Aug 2014 04:06:16 +0000 (21:06 -0700)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/MonitorDBStore.h
Simple merge
diff --cc src/mon/Paxos.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 13 Aug 2014 04:06:16 +0000 (21:06 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 13 Aug 2014 04:06:16 +0000 (21:06 -0700)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonitorDBStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Paxos.cc	patch \|	diff1 \|	diff2 \|	blob \| history