Merge pull request #17799 from amitkumar50/cov-misc-7

author Kefu Chai <tchaikov@gmail.com>

Wed, 22 Nov 2017 06:44:24 +0000 (14:44 +0800)

committer GitHub <noreply@github.com>

Wed, 22 Nov 2017 06:44:24 +0000 (14:44 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 22 Nov 2017 06:44:24 +0000 (14:44 +0800)
committer GitHub <noreply@github.com>
Wed, 22 Nov 2017 06:44:24 +0000 (14:44 +0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 22 Nov 2017 06:44:24 +0000 (14:44 +0800)
committer	GitHub <noreply@github.com>
	Wed, 22 Nov 2017 06:44:24 +0000 (14:44 +0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history