Merge pull request #29663 from cxytt/bugfix

author Kefu Chai <kchai@redhat.com>

Fri, 16 Aug 2019 12:22:32 +0000 (20:22 +0800)

committer GitHub <noreply@github.com>

Fri, 16 Aug 2019 12:22:32 +0000 (20:22 +0800)
author Kefu Chai <kchai@redhat.com>
Fri, 16 Aug 2019 12:22:32 +0000 (20:22 +0800)
committer GitHub <noreply@github.com>
Fri, 16 Aug 2019 12:22:32 +0000 (20:22 +0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Fri, 16 Aug 2019 12:22:32 +0000 (20:22 +0800)
committer	GitHub <noreply@github.com>
	Fri, 16 Aug 2019 12:22:32 +0000 (20:22 +0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history