Merge pull request #10883 from dachary/wip-17141-jewel

author Samuel Just <sjust@redhat.com>

Mon, 17 Oct 2016 18:54:29 +0000 (11:54 -0700)

committer GitHub <noreply@github.com>

Mon, 17 Oct 2016 18:54:29 +0000 (11:54 -0700)
author Samuel Just <sjust@redhat.com>
Mon, 17 Oct 2016 18:54:29 +0000 (11:54 -0700)
committer GitHub <noreply@github.com>
Mon, 17 Oct 2016 18:54:29 +0000 (11:54 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Samuel Just <sjust@redhat.com>
	Mon, 17 Oct 2016 18:54:29 +0000 (11:54 -0700)
committer	GitHub <noreply@github.com>
	Mon, 17 Oct 2016 18:54:29 +0000 (11:54 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history