Merge pull request #21151 from xiexingguo/wip-prune-olr

author Kefu Chai <tchaikov@gmail.com>

Sat, 7 Apr 2018 09:25:48 +0000 (17:25 +0800)

committer GitHub <noreply@github.com>

Sat, 7 Apr 2018 09:25:48 +0000 (17:25 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 7 Apr 2018 09:25:48 +0000 (17:25 +0800)
committer GitHub <noreply@github.com>
Sat, 7 Apr 2018 09:25:48 +0000 (17:25 +0800)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/PGBackend.cc
Simple merge
diff --cc src/osd/PGBackend.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 7 Apr 2018 09:25:48 +0000 (17:25 +0800)
committer	GitHub <noreply@github.com>
	Sat, 7 Apr 2018 09:25:48 +0000 (17:25 +0800)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PGBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PGBackend.h	patch \|	diff1 \|	diff2 \|	blob \| history