Merge pull request #19161 from xiexingguo/wip-pg-log

author Kefu Chai <tchaikov@gmail.com>

Sat, 2 Dec 2017 14:36:19 +0000 (22:36 +0800)

committer GitHub <noreply@github.com>

Sat, 2 Dec 2017 14:36:19 +0000 (22:36 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 2 Dec 2017 14:36:19 +0000 (22:36 +0800)
committer GitHub <noreply@github.com>
Sat, 2 Dec 2017 14:36:19 +0000 (22:36 +0800)
diff --cc src/osd/PGLog.h
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 2 Dec 2017 14:36:19 +0000 (22:36 +0800)
committer	GitHub <noreply@github.com>
	Sat, 2 Dec 2017 14:36:19 +0000 (22:36 +0800)
		1	2
src/osd/PGLog.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history