Merge pull request #19926 from batrick/i22527

author Sage Weil <sage@newdream.net>

Sat, 13 Jan 2018 15:55:12 +0000 (09:55 -0600)

committer GitHub <noreply@github.com>

Sat, 13 Jan 2018 15:55:12 +0000 (09:55 -0600)
author Sage Weil <sage@newdream.net>
Sat, 13 Jan 2018 15:55:12 +0000 (09:55 -0600)
committer GitHub <noreply@github.com>
Sat, 13 Jan 2018 15:55:12 +0000 (09:55 -0600)
diff --cc src/mgr/DaemonServer.cc
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 13 Jan 2018 15:55:12 +0000 (09:55 -0600)
committer	GitHub <noreply@github.com>
	Sat, 13 Jan 2018 15:55:12 +0000 (09:55 -0600)
		1	2
src/mgr/DaemonServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history