Merge pull request #16712 from gregsfortytwo/wip-20808

author Sage Weil <sage@newdream.net>

Tue, 1 Aug 2017 19:11:29 +0000 (14:11 -0500)

committer GitHub <noreply@github.com>

Tue, 1 Aug 2017 19:11:29 +0000 (14:11 -0500)
author Sage Weil <sage@newdream.net>
Tue, 1 Aug 2017 19:11:29 +0000 (14:11 -0500)
committer GitHub <noreply@github.com>
Tue, 1 Aug 2017 19:11:29 +0000 (14:11 -0500)
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@newdream.net>
	Tue, 1 Aug 2017 19:11:29 +0000 (14:11 -0500)
committer	GitHub <noreply@github.com>
	Tue, 1 Aug 2017 19:11:29 +0000 (14:11 -0500)
		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