Merge pull request #14404 from tchaikov/wip-another-mgr-command

author Kefu Chai <tchaikov@gmail.com>

Thu, 13 Apr 2017 05:57:42 +0000 (13:57 +0800)

committer GitHub <noreply@github.com>

Thu, 13 Apr 2017 05:57:42 +0000 (13:57 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 13 Apr 2017 05:57:42 +0000 (13:57 +0800)
committer GitHub <noreply@github.com>
Thu, 13 Apr 2017 05:57:42 +0000 (13:57 +0800)
diff --cc src/mon/MonClient.h
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 13 Apr 2017 05:57:42 +0000 (13:57 +0800)
committer	GitHub <noreply@github.com>
	Thu, 13 Apr 2017 05:57:42 +0000 (13:57 +0800)
		1	2
src/mon/MonClient.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history