Merge "AsyncRestClient reuse of SSL context"

author Henrik Andersson <henrik.b.andersson@est.tech>

Mon, 12 Oct 2020 13:06:03 +0000 (13:06 +0000)

committer Gerrit Code Review <gerrit@o-ran-sc.org>

Mon, 12 Oct 2020 13:06:03 +0000 (13:06 +0000)
author Henrik Andersson <henrik.b.andersson@est.tech>
Mon, 12 Oct 2020 13:06:03 +0000 (13:06 +0000)
committer Gerrit Code Review <gerrit@o-ran-sc.org>
Mon, 12 Oct 2020 13:06:03 +0000 (13:06 +0000)
diff --cc enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java
Simple merge
diff --cc enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java
Simple merge
author	Henrik Andersson <henrik.b.andersson@est.tech>
	Mon, 12 Oct 2020 13:06:03 +0000 (13:06 +0000)
committer	Gerrit Code Review <gerrit@o-ran-sc.org>
	Mon, 12 Oct 2020 13:06:03 +0000 (13:06 +0000)
		1	2
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerController.java	patch \|	diff1 \|	diff2 \|	blob \| history
enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java	patch \|	diff1 \|	diff2 \|	blob \| history