Merge pull request #20761 from liewegas/wip-service-unregister

author Sage Weil <sage@newdream.net>

Mon, 23 Apr 2018 21:27:50 +0000 (16:27 -0500)

committer GitHub <noreply@github.com>

Mon, 23 Apr 2018 21:27:50 +0000 (16:27 -0500)
author Sage Weil <sage@newdream.net>
Mon, 23 Apr 2018 21:27:50 +0000 (16:27 -0500)
committer GitHub <noreply@github.com>
Mon, 23 Apr 2018 21:27:50 +0000 (16:27 -0500)
diff --cc src/common/options.cc
Simple merge
diff --cc src/mgr/DaemonServer.cc
Simple merge
diff --cc src/mgr/MgrClient.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 23 Apr 2018 21:27:50 +0000 (16:27 -0500)
committer	GitHub <noreply@github.com>
	Mon, 23 Apr 2018 21:27:50 +0000 (16:27 -0500)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/DaemonServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/MgrClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history