Merge pull request #5953 from guangyy/wip-13121

author Sage Weil <sage@redhat.com>

Fri, 4 Dec 2015 15:09:13 +0000 (10:09 -0500)

committer Sage Weil <sage@redhat.com>

Fri, 4 Dec 2015 15:09:13 +0000 (10:09 -0500)
author Sage Weil <sage@redhat.com>
Fri, 4 Dec 2015 15:09:13 +0000 (10:09 -0500)
committer Sage Weil <sage@redhat.com>
Fri, 4 Dec 2015 15:09:13 +0000 (10:09 -0500)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 4 Dec 2015 15:09:13 +0000 (10:09 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 4 Dec 2015 15:09:13 +0000 (10:09 -0500)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history