Merge pull request #14490 from liewegas/wip-no-luminous

author Sage Weil <sage@newdream.net>

Sat, 15 Apr 2017 01:05:45 +0000 (20:05 -0500)

committer GitHub <noreply@github.com>

Sat, 15 Apr 2017 01:05:45 +0000 (20:05 -0500)
author Sage Weil <sage@newdream.net>
Sat, 15 Apr 2017 01:05:45 +0000 (20:05 -0500)
committer GitHub <noreply@github.com>
Sat, 15 Apr 2017 01:05:45 +0000 (20:05 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 15 Apr 2017 01:05:45 +0000 (20:05 -0500)
committer	GitHub <noreply@github.com>
	Sat, 15 Apr 2017 01:05:45 +0000 (20:05 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history