Merge pull request #16709 from dzafman/wip-standalone

author Sage Weil <sage@newdream.net>

Fri, 11 Aug 2017 02:33:43 +0000 (21:33 -0500)

committer GitHub <noreply@github.com>

Fri, 11 Aug 2017 02:33:43 +0000 (21:33 -0500)
author Sage Weil <sage@newdream.net>
Fri, 11 Aug 2017 02:33:43 +0000 (21:33 -0500)
committer GitHub <noreply@github.com>
Fri, 11 Aug 2017 02:33:43 +0000 (21:33 -0500)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 11 Aug 2017 02:33:43 +0000 (21:33 -0500)
committer	GitHub <noreply@github.com>
	Fri, 11 Aug 2017 02:33:43 +0000 (21:33 -0500)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history