Merge pull request #26021 from majianpeng/osd-remove-unused-code

author Kefu Chai <tchaikov@gmail.com>

Sun, 20 Jan 2019 02:30:34 +0000 (10:30 +0800)

committer GitHub <noreply@github.com>

Sun, 20 Jan 2019 02:30:34 +0000 (10:30 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sun, 20 Jan 2019 02:30:34 +0000 (10:30 +0800)
committer GitHub <noreply@github.com>
Sun, 20 Jan 2019 02:30:34 +0000 (10:30 +0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sun, 20 Jan 2019 02:30:34 +0000 (10:30 +0800)
committer	GitHub <noreply@github.com>
	Sun, 20 Jan 2019 02:30:34 +0000 (10:30 +0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history