Merge pull request #23016 from rzarzynski/wip-osd-cleanup-log_op_stats

author Kefu Chai <tchaikov@gmail.com>

Fri, 20 Jul 2018 12:53:35 +0000 (20:53 +0800)

committer GitHub <noreply@github.com>

Fri, 20 Jul 2018 12:53:35 +0000 (20:53 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 20 Jul 2018 12:53:35 +0000 (20:53 +0800)
committer GitHub <noreply@github.com>
Fri, 20 Jul 2018 12:53:35 +0000 (20:53 +0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 20 Jul 2018 12:53:35 +0000 (20:53 +0800)
committer	GitHub <noreply@github.com>
	Fri, 20 Jul 2018 12:53:35 +0000 (20:53 +0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history