Merge "Add default tenant as input of VIM."

author Li Zi <li.zi30@zte.com.cn>

Fri, 13 Oct 2017 10:34:56 +0000 (10:34 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Fri, 13 Oct 2017 10:34:56 +0000 (10:34 +0000)
author Li Zi <li.zi30@zte.com.cn>
Fri, 13 Oct 2017 10:34:56 +0000 (10:34 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Fri, 13 Oct 2017 10:34:56 +0000 (10:34 +0000)
diff --cc portal/src/main/webapp/extsys/vim/js/vimController.js
Simple merge
diff --cc portal/src/main/webapp/extsys/vim/vimView.html
Simple merge
author	Li Zi <li.zi30@zte.com.cn>
	Fri, 13 Oct 2017 10:34:56 +0000 (10:34 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Fri, 13 Oct 2017 10:34:56 +0000 (10:34 +0000)
		1	2
portal/src/main/webapp/extsys/vim/js/vimController.js	patch \|	diff1 \|	diff2 \|	blob \| history
portal/src/main/webapp/extsys/vim/vimView.html	patch \|	diff1 \|	diff2 \|	blob \| history