Merge "Correct flow for ScaleOut"

author Amichai Hemli <ah0398@intl.att.com>

Tue, 9 Oct 2018 11:23:31 +0000 (11:23 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Tue, 9 Oct 2018 11:23:31 +0000 (11:23 +0000)
author Amichai Hemli <ah0398@intl.att.com>
Tue, 9 Oct 2018 11:23:31 +0000 (11:23 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Tue, 9 Oct 2018 11:23:31 +0000 (11:23 +0000)
diff --cc epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
Simple merge
author	Amichai Hemli <ah0398@intl.att.com>
	Tue, 9 Oct 2018 11:23:31 +0000 (11:23 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Tue, 9 Oct 2018 11:23:31 +0000 (11:23 +0000)