Merge pull request #17759 from liewegas/wip-21407

author Sage Weil <sage@newdream.net>

Tue, 10 Oct 2017 18:17:01 +0000 (13:17 -0500)

committer GitHub <noreply@github.com>

Tue, 10 Oct 2017 18:17:01 +0000 (13:17 -0500)
author Sage Weil <sage@newdream.net>
Tue, 10 Oct 2017 18:17:01 +0000 (13:17 -0500)
committer GitHub <noreply@github.com>
Tue, 10 Oct 2017 18:17:01 +0000 (13:17 -0500)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 10 Oct 2017 18:17:01 +0000 (13:17 -0500)
committer	GitHub <noreply@github.com>
	Tue, 10 Oct 2017 18:17:01 +0000 (13:17 -0500)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history