Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Fri, 27 Sep 2013 01:24:40 +0000 (18:24 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 27 Sep 2013 01:24:40 +0000 (18:24 -0700)
author Sage Weil <sage@inktank.com>
Fri, 27 Sep 2013 01:24:40 +0000 (18:24 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 27 Sep 2013 01:24:40 +0000 (18:24 -0700)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 27 Sep 2013 01:24:40 +0000 (18:24 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 27 Sep 2013 01:24:40 +0000 (18:24 -0700)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history