Merge pull request #14178 from songbaisen/m10

author Sage Weil <sage@newdream.net>

Sat, 1 Jul 2017 14:11:31 +0000 (09:11 -0500)

committer GitHub <noreply@github.com>

Sat, 1 Jul 2017 14:11:31 +0000 (09:11 -0500)
author Sage Weil <sage@newdream.net>
Sat, 1 Jul 2017 14:11:31 +0000 (09:11 -0500)
committer GitHub <noreply@github.com>
Sat, 1 Jul 2017 14:11:31 +0000 (09:11 -0500)
diff --cc src/mon/Monitor.h
Simple merge
diff --cc src/mon/MonmapMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 1 Jul 2017 14:11:31 +0000 (09:11 -0500)
committer	GitHub <noreply@github.com>
	Sat, 1 Jul 2017 14:11:31 +0000 (09:11 -0500)
		1	2
src/mon/Monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonmapMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history