Merge pull request #21612 from Songweibin/wip-pglog-cleanup

author Kefu Chai <tchaikov@gmail.com>

Thu, 26 Apr 2018 05:07:10 +0000 (13:07 +0800)

committer GitHub <noreply@github.com>

Thu, 26 Apr 2018 05:07:10 +0000 (13:07 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 26 Apr 2018 05:07:10 +0000 (13:07 +0800)
committer GitHub <noreply@github.com>
Thu, 26 Apr 2018 05:07:10 +0000 (13:07 +0800)
diff --cc src/osd/PGLog.cc
Simple merge
diff --cc src/osd/PGLog.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 26 Apr 2018 05:07:10 +0000 (13:07 +0800)
committer	GitHub <noreply@github.com>
	Thu, 26 Apr 2018 05:07:10 +0000 (13:07 +0800)
		1	2
src/osd/PGLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PGLog.h	patch \|	diff1 \|	diff2 \|	blob \| history