From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 29 May 2020 11:58:46 +0000 (+0000)
Subject: Merge changes I9b3c7aab,Ia75ba66d,I66886290,I630154c4,I42bb5a88, ... into frankfurt
X-Git-Tag: 6.0.0~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6c988d8ecf867cf1788f984120a380d386e95a9e;p=oom.git

Merge changes I9b3c7aab,Ia75ba66d,I66886290,I630154c4,I42bb5a88, ... into frankfurt

* changes:
  [COMMON] Use common aaf template in elasticsearch
  [PORTAL] Move portal subcharts to components
  [SDNC] Use common aaf template in sdnc
  [COMMON] Fix certInitializer to use proper global values
  [DMAAP] Use common aaf template in dmaap-bc
  [COMMON] Fix certInitializer
  [COMMON] Override truststore in aaf_agent image
---

6c988d8ecf867cf1788f984120a380d386e95a9e