Merge pull request #18527 from xiexingguo/wip-hunt-scrub-mismatch

author Sage Weil <sage@newdream.net>

Thu, 26 Oct 2017 02:49:45 +0000 (21:49 -0500)

committer GitHub <noreply@github.com>

Thu, 26 Oct 2017 02:49:45 +0000 (21:49 -0500)
author Sage Weil <sage@newdream.net>
Thu, 26 Oct 2017 02:49:45 +0000 (21:49 -0500)
committer GitHub <noreply@github.com>
Thu, 26 Oct 2017 02:49:45 +0000 (21:49 -0500)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 26 Oct 2017 02:49:45 +0000 (21:49 -0500)
committer	GitHub <noreply@github.com>
	Thu, 26 Oct 2017 02:49:45 +0000 (21:49 -0500)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history