Merge pull request #21373 from ovh/bp-hb-divbyzero

author Kefu Chai <tchaikov@gmail.com>

Sun, 15 Apr 2018 14:56:53 +0000 (22:56 +0800)

committer GitHub <noreply@github.com>

Sun, 15 Apr 2018 14:56:53 +0000 (22:56 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sun, 15 Apr 2018 14:56:53 +0000 (22:56 +0800)
committer GitHub <noreply@github.com>
Sun, 15 Apr 2018 14:56:53 +0000 (22:56 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sun, 15 Apr 2018 14:56:53 +0000 (22:56 +0800)
committer	GitHub <noreply@github.com>
	Sun, 15 Apr 2018 14:56:53 +0000 (22:56 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history