Merge remote-tracking branch 'private/wip-cx-luminous' into luminous

author Sage Weil <sage@redhat.com>

Mon, 9 Jul 2018 13:12:04 +0000 (08:12 -0500)

committer Sage Weil <sage@redhat.com>

Mon, 9 Jul 2018 13:12:04 +0000 (08:12 -0500)
author Sage Weil <sage@redhat.com>
Mon, 9 Jul 2018 13:12:04 +0000 (08:12 -0500)
committer Sage Weil <sage@redhat.com>
Mon, 9 Jul 2018 13:12:04 +0000 (08:12 -0500)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/mds/MDSDaemon.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 9 Jul 2018 13:12:04 +0000 (08:12 -0500)
committer	Sage Weil <sage@redhat.com>
	Mon, 9 Jul 2018 13:12:04 +0000 (08:12 -0500)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSDaemon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history