Merge "Implementation for HTTP/HTTPS and endpoints"

author Lusheng Ji <lji@research.att.com>

Fri, 20 Apr 2018 13:21:58 +0000 (13:21 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Fri, 20 Apr 2018 13:21:58 +0000 (13:21 +0000)
author Lusheng Ji <lji@research.att.com>
Fri, 20 Apr 2018 13:21:58 +0000 (13:21 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Fri, 20 Apr 2018 13:21:58 +0000 (13:21 +0000)
diff --cc pom.xml
Simple merge
diff --cc prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java
Simple merge
author	Lusheng Ji <lji@research.att.com>
	Fri, 20 Apr 2018 13:21:58 +0000 (13:21 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Fri, 20 Apr 2018 13:21:58 +0000 (13:21 +0000)
		1	2
pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java	patch \|	diff1 \|	diff2 \|	blob \| history