Merge pull request #18070 from liewegas/wip-21613

author Sage Weil <sage@newdream.net>

Thu, 5 Oct 2017 19:37:52 +0000 (14:37 -0500)

committer GitHub <noreply@github.com>

Thu, 5 Oct 2017 19:37:52 +0000 (14:37 -0500)
author Sage Weil <sage@newdream.net>
Thu, 5 Oct 2017 19:37:52 +0000 (14:37 -0500)
committer GitHub <noreply@github.com>
Thu, 5 Oct 2017 19:37:52 +0000 (14:37 -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>
	Thu, 5 Oct 2017 19:37:52 +0000 (14:37 -0500)
committer	GitHub <noreply@github.com>
	Thu, 5 Oct 2017 19:37:52 +0000 (14:37 -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