Merge pull request #13207 from liewegas/wip-mapping

author Sage Weil <sage@newdream.net>

Sat, 18 Feb 2017 18:58:05 +0000 (12:58 -0600)

committer GitHub <noreply@github.com>

Sat, 18 Feb 2017 18:58:05 +0000 (12:58 -0600)
author Sage Weil <sage@newdream.net>
Sat, 18 Feb 2017 18:58:05 +0000 (12:58 -0600)
committer GitHub <noreply@github.com>
Sat, 18 Feb 2017 18:58:05 +0000 (12:58 -0600)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 18 Feb 2017 18:58:05 +0000 (12:58 -0600)
committer	GitHub <noreply@github.com>
	Sat, 18 Feb 2017 18:58:05 +0000 (12:58 -0600)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history