Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Fri, 30 May 2014 17:13:59 +0000 (10:13 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 30 May 2014 17:13:59 +0000 (10:13 -0700)
author Sage Weil <sage@inktank.com>
Fri, 30 May 2014 17:13:59 +0000 (10:13 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 30 May 2014 17:13:59 +0000 (10:13 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 30 May 2014 17:13:59 +0000 (10:13 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 30 May 2014 17:13:59 +0000 (10:13 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history