Merge pull request #8840 from tchaikov/wip-opt-u32

author Sage Weil <sage@redhat.com>

Fri, 20 May 2016 16:57:53 +0000 (12:57 -0400)

committer Sage Weil <sage@redhat.com>

Fri, 20 May 2016 16:57:53 +0000 (12:57 -0400)
author Sage Weil <sage@redhat.com>
Fri, 20 May 2016 16:57:53 +0000 (12:57 -0400)
committer Sage Weil <sage@redhat.com>
Fri, 20 May 2016 16:57:53 +0000 (12:57 -0400)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 20 May 2016 16:57:53 +0000 (12:57 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 20 May 2016 16:57:53 +0000 (12:57 -0400)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history