Merge pull request #5780 from dzafman/wip-12387

author Sage Weil <sage@redhat.com>

Thu, 10 Sep 2015 14:56:45 +0000 (10:56 -0400)

committer Sage Weil <sage@redhat.com>

Thu, 10 Sep 2015 14:56:45 +0000 (10:56 -0400)
author Sage Weil <sage@redhat.com>
Thu, 10 Sep 2015 14:56:45 +0000 (10:56 -0400)
committer Sage Weil <sage@redhat.com>
Thu, 10 Sep 2015 14:56:45 +0000 (10:56 -0400)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 10 Sep 2015 14:56:45 +0000 (10:56 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 10 Sep 2015 14:56:45 +0000 (10:56 -0400)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history