Merge pull request #15917 from xiexingguo/wip-upmap-fixes

author Sage Weil <sage@newdream.net>

Tue, 27 Jun 2017 15:19:41 +0000 (10:19 -0500)

committer GitHub <noreply@github.com>

Tue, 27 Jun 2017 15:19:41 +0000 (10:19 -0500)
author Sage Weil <sage@newdream.net>
Tue, 27 Jun 2017 15:19:41 +0000 (10:19 -0500)
committer GitHub <noreply@github.com>
Tue, 27 Jun 2017 15:19:41 +0000 (10:19 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 27 Jun 2017 15:19:41 +0000 (10:19 -0500)
committer	GitHub <noreply@github.com>
	Tue, 27 Jun 2017 15:19:41 +0000 (10:19 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history