Merge "Fix service instantiation error"

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

Thu, 4 Oct 2018 11:09:38 +0000 (11:09 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 4 Oct 2018 11:09:38 +0000 (11:09 +0000)
author Amichai Hemli <ah0398@intl.att.com>
Thu, 4 Oct 2018 11:09:38 +0000 (11:09 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 4 Oct 2018 11:09:38 +0000 (11:09 +0000)
diff --cc epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
Simple merge
diff --cc epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties
Simple merge
author	Amichai Hemli <ah0398@intl.att.com>
	Thu, 4 Oct 2018 11:09:38 +0000 (11:09 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 4 Oct 2018 11:09:38 +0000 (11:09 +0000)
		1	2
epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties	patch \|	diff1 \|	diff2 \|	blob \| history
epsdk-app-onap/src/main/webapp/WEB-INF/conf/system_template.properties	patch \|	diff1 \|	diff2 \|	blob \| history