Merge pull request #19211 from ZVampirEM77/wip-em-pg-cleanup

author Kefu Chai <tchaikov@gmail.com>

Fri, 15 Dec 2017 07:05:50 +0000 (15:05 +0800)

committer GitHub <noreply@github.com>

Fri, 15 Dec 2017 07:05:50 +0000 (15:05 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 15 Dec 2017 07:05:50 +0000 (15:05 +0800)
committer GitHub <noreply@github.com>
Fri, 15 Dec 2017 07:05:50 +0000 (15:05 +0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 15 Dec 2017 07:05:50 +0000 (15:05 +0800)
committer	GitHub <noreply@github.com>
	Fri, 15 Dec 2017 07:05:50 +0000 (15:05 +0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history