Merge pull request #27798 from neha-ojha/wip-39441

author Neha Ojha <nojha@redhat.com>

Fri, 26 Apr 2019 23:00:53 +0000 (16:00 -0700)

committer GitHub <noreply@github.com>

Fri, 26 Apr 2019 23:00:53 +0000 (16:00 -0700)
author Neha Ojha <nojha@redhat.com>
Fri, 26 Apr 2019 23:00:53 +0000 (16:00 -0700)
committer GitHub <noreply@github.com>
Fri, 26 Apr 2019 23:00:53 +0000 (16:00 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Neha Ojha <nojha@redhat.com>
	Fri, 26 Apr 2019 23:00:53 +0000 (16:00 -0700)
committer	GitHub <noreply@github.com>
	Fri, 26 Apr 2019 23:00:53 +0000 (16:00 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history