Merge pull request #21339 from guzhongyan/tp-cleanup

author Yuri Weinstein <yweinste@redhat.com>

Fri, 27 Apr 2018 21:22:35 +0000 (14:22 -0700)

committer GitHub <noreply@github.com>

Fri, 27 Apr 2018 21:22:35 +0000 (14:22 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 27 Apr 2018 21:22:35 +0000 (14:22 -0700)
committer GitHub <noreply@github.com>
Fri, 27 Apr 2018 21:22:35 +0000 (14:22 -0700)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 27 Apr 2018 21:22:35 +0000 (14:22 -0700)
committer	GitHub <noreply@github.com>
	Fri, 27 Apr 2018 21:22:35 +0000 (14:22 -0700)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history