Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Sat, 5 Jul 2014 04:18:55 +0000 (21:18 -0700)

committer Sage Weil <sage@inktank.com>

Sat, 5 Jul 2014 04:18:55 +0000 (21:18 -0700)
author Sage Weil <sage@inktank.com>
Sat, 5 Jul 2014 04:18:55 +0000 (21:18 -0700)
committer Sage Weil <sage@inktank.com>
Sat, 5 Jul 2014 04:18:55 +0000 (21:18 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 5 Jul 2014 04:18:55 +0000 (21:18 -0700)
committer	Sage Weil <sage@inktank.com>
	Sat, 5 Jul 2014 04:18:55 +0000 (21:18 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history