Merge pull request #16955 from xiexingguo/wip-app-ls

author Xie Xingguo <258156334@qq.com>

Sat, 19 Aug 2017 09:49:43 +0000 (17:49 +0800)

committer GitHub <noreply@github.com>

Sat, 19 Aug 2017 09:49:43 +0000 (17:49 +0800)
author Xie Xingguo <258156334@qq.com>
Sat, 19 Aug 2017 09:49:43 +0000 (17:49 +0800)
committer GitHub <noreply@github.com>
Sat, 19 Aug 2017 09:49:43 +0000 (17:49 +0800)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Xie Xingguo <258156334@qq.com>
	Sat, 19 Aug 2017 09:49:43 +0000 (17:49 +0800)
committer	GitHub <noreply@github.com>
	Sat, 19 Aug 2017 09:49:43 +0000 (17:49 +0800)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history