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

author Yuri Weinstein <yuri.weinstein@gmail.com>

Tue, 31 Oct 2017 20:51:31 +0000 (13:51 -0700)

committer GitHub <noreply@github.com>

Tue, 31 Oct 2017 20:51:31 +0000 (13:51 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 31 Oct 2017 20:51:31 +0000 (13:51 -0700)
committer GitHub <noreply@github.com>
Tue, 31 Oct 2017 20:51:31 +0000 (13:51 -0700)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 31 Oct 2017 20:51:31 +0000 (13:51 -0700)
committer	GitHub <noreply@github.com>
	Tue, 31 Oct 2017 20:51:31 +0000 (13:51 -0700)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history