Merge pull request #16455 from liewegas/wip-20667

author Sage Weil <sage@newdream.net>

Fri, 21 Jul 2017 16:00:42 +0000 (11:00 -0500)

committer GitHub <noreply@github.com>

Fri, 21 Jul 2017 16:00:42 +0000 (11:00 -0500)
author Sage Weil <sage@newdream.net>
Fri, 21 Jul 2017 16:00:42 +0000 (11:00 -0500)
committer GitHub <noreply@github.com>
Fri, 21 Jul 2017 16:00:42 +0000 (11:00 -0500)
diff --cc src/mds/MDSDaemon.cc
Simple merge
diff --cc src/mgr/DaemonServer.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 21 Jul 2017 16:00:42 +0000 (11:00 -0500)
committer	GitHub <noreply@github.com>
	Fri, 21 Jul 2017 16:00:42 +0000 (11:00 -0500)
		1	2
src/mds/MDSDaemon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/DaemonServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history