Merge PR #26614 into master

author Sage Weil <sage@redhat.com>

Fri, 1 Mar 2019 00:08:29 +0000 (18:08 -0600)

committer Sage Weil <sage@redhat.com>

Fri, 1 Mar 2019 00:08:29 +0000 (18:08 -0600)
author Sage Weil <sage@redhat.com>
Fri, 1 Mar 2019 00:08:29 +0000 (18:08 -0600)
committer Sage Weil <sage@redhat.com>
Fri, 1 Mar 2019 00:08:29 +0000 (18:08 -0600)
diff --cc src/mon/PGMap.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 1 Mar 2019 00:08:29 +0000 (18:08 -0600)
committer	Sage Weil <sage@redhat.com>
	Fri, 1 Mar 2019 00:08:29 +0000 (18:08 -0600)
		1	2
src/mon/PGMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history