Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Sat, 24 Aug 2013 21:12:44 +0000 (14:12 -0700)

committer Sage Weil <sage@inktank.com>

Sat, 24 Aug 2013 21:12:44 +0000 (14:12 -0700)
author Sage Weil <sage@inktank.com>
Sat, 24 Aug 2013 21:12:44 +0000 (14:12 -0700)
committer Sage Weil <sage@inktank.com>
Sat, 24 Aug 2013 21:12:44 +0000 (14:12 -0700)
diff --cc src/ceph-disk
Simple merge
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/mon/Paxos.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 24 Aug 2013 21:12:44 +0000 (14:12 -0700)
committer	Sage Weil <sage@inktank.com>
	Sat, 24 Aug 2013 21:12:44 +0000 (14:12 -0700)
		1	2
src/ceph-disk	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Paxos.cc	patch \|	diff1 \|	diff2 \|	blob \| history