Merge pull request #9575 from Abhishekvrshny/wip-16150-jewel

author Sage Weil <sage@redhat.com>

Mon, 27 Jun 2016 13:11:43 +0000 (09:11 -0400)

committer GitHub <noreply@github.com>

Mon, 27 Jun 2016 13:11:43 +0000 (09:11 -0400)
author Sage Weil <sage@redhat.com>
Mon, 27 Jun 2016 13:11:43 +0000 (09:11 -0400)
committer GitHub <noreply@github.com>
Mon, 27 Jun 2016 13:11:43 +0000 (09:11 -0400)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 27 Jun 2016 13:11:43 +0000 (09:11 -0400)
committer	GitHub <noreply@github.com>
	Mon, 27 Jun 2016 13:11:43 +0000 (09:11 -0400)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history