Merge pull request #20752 from jcsp/wip-dashboard-build-tweak

author Kefu Chai <tchaikov@gmail.com>

Sun, 15 Apr 2018 15:01:35 +0000 (23:01 +0800)

committer GitHub <noreply@github.com>

Sun, 15 Apr 2018 15:01:35 +0000 (23:01 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sun, 15 Apr 2018 15:01:35 +0000 (23:01 +0800)
committer GitHub <noreply@github.com>
Sun, 15 Apr 2018 15:01:35 +0000 (23:01 +0800)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/pybind/mgr/dashboard/CMakeLists.txt
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sun, 15 Apr 2018 15:01:35 +0000 (23:01 +0800)
committer	GitHub <noreply@github.com>
	Sun, 15 Apr 2018 15:01:35 +0000 (23:01 +0800)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history