Merge pull request #18241 from hjwsm1989/wip-21756

author Kefu Chai <tchaikov@gmail.com>

Thu, 31 May 2018 16:15:53 +0000 (00:15 +0800)

committer GitHub <noreply@github.com>

Thu, 31 May 2018 16:15:53 +0000 (00:15 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 31 May 2018 16:15:53 +0000 (00:15 +0800)
committer GitHub <noreply@github.com>
Thu, 31 May 2018 16:15:53 +0000 (00:15 +0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 31 May 2018 16:15:53 +0000 (00:15 +0800)
committer	GitHub <noreply@github.com>
	Thu, 31 May 2018 16:15:53 +0000 (00:15 +0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history