Merge pull request #20540 from ovh/bp-optracker-cleanup

author Kefu Chai <tchaikov@gmail.com>

Wed, 28 Feb 2018 01:29:10 +0000 (09:29 +0800)

committer GitHub <noreply@github.com>

Wed, 28 Feb 2018 01:29:10 +0000 (09:29 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 28 Feb 2018 01:29:10 +0000 (09:29 +0800)
committer GitHub <noreply@github.com>
Wed, 28 Feb 2018 01:29:10 +0000 (09:29 +0800)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 28 Feb 2018 01:29:10 +0000 (09:29 +0800)
committer	GitHub <noreply@github.com>
	Wed, 28 Feb 2018 01:29:10 +0000 (09:29 +0800)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history