Merge pull request #15199 from xiexingguo/wip-object-logic-size

author Xie Xingguo <258156334@qq.com>

Sat, 30 Sep 2017 06:50:32 +0000 (14:50 +0800)

committer GitHub <noreply@github.com>

Sat, 30 Sep 2017 06:50:32 +0000 (14:50 +0800)
author Xie Xingguo <258156334@qq.com>
Sat, 30 Sep 2017 06:50:32 +0000 (14:50 +0800)
committer GitHub <noreply@github.com>
Sat, 30 Sep 2017 06:50:32 +0000 (14:50 +0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Xie Xingguo <258156334@qq.com>
	Sat, 30 Sep 2017 06:50:32 +0000 (14:50 +0800)
committer	GitHub <noreply@github.com>
	Sat, 30 Sep 2017 06:50:32 +0000 (14:50 +0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history