Merge pull request #20204 from tchaikov/wip-pr-18614-luminous

author Yuri Weinstein <yuri.weinstein@gmail.com>

Wed, 7 Feb 2018 22:49:36 +0000 (14:49 -0800)

committer GitHub <noreply@github.com>

Wed, 7 Feb 2018 22:49:36 +0000 (14:49 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Wed, 7 Feb 2018 22:49:36 +0000 (14:49 -0800)
committer GitHub <noreply@github.com>
Wed, 7 Feb 2018 22:49:36 +0000 (14:49 -0800)
diff --cc src/mgr/DaemonServer.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Wed, 7 Feb 2018 22:49:36 +0000 (14:49 -0800)
committer	GitHub <noreply@github.com>
	Wed, 7 Feb 2018 22:49:36 +0000 (14:49 -0800)
		1	2
src/mgr/DaemonServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history