Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@redhat.com>

Wed, 27 May 2015 21:25:28 +0000 (17:25 -0400)

committer Sage Weil <sage@redhat.com>

Wed, 27 May 2015 21:25:28 +0000 (17:25 -0400)
author Sage Weil <sage@redhat.com>
Wed, 27 May 2015 21:25:28 +0000 (17:25 -0400)
committer Sage Weil <sage@redhat.com>
Wed, 27 May 2015 21:25:28 +0000 (17:25 -0400)
diff --cc SubmittingPatches
Simple merge
diff --cc ceph.spec.in
Simple merge
diff --cc debian/control
Simple merge
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/crush/CrushWrapper.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 27 May 2015 21:25:28 +0000 (17:25 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 27 May 2015 21:25:28 +0000 (17:25 -0400)
		1	2
SubmittingPatches	patch \|	diff1 \|	diff2 \|	blob \| history
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history