Uplift from ONAP.

Instability fix.

Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Issue-ID: NONRTRIC-743
Change-Id: I099f5f41d155c79db4067ca8508c026ac86091ea

diff --git a/config/application.yaml b/config/application.yaml
index 7628624..f0f5337 100644 (file)
--- a/config/application.yaml
+++ b/config/application.yaml
@@ -56,6 +56,8 @@ server:
       key-store: /opt/app/policy-agent/etc/cert/keystore.jks
       key-password: policy_agent
       key-alias: policy_agent
+      # trust-store-password:
+      # trust-store:
 app:
   # Location of the component configuration file.
   filepath: /opt/app/policy-agent/data/application_configuration.json
@@ -80,4 +82,3 @@ app:
   # A file containing an authorization token, which shall be inserted in each HTTP header (authorization).
   # If the file name is empty, no authorization token is sent.
   auth-token-file:
-

diff --git a/onap/oran b/onap/oran
index 7795090..87b1ff5 160000 (submodule)
--- a/onap/oran
+++ b/onap/oran
@@ -1 +1 @@
-Subproject commit 779509036cdadb5735d336ed93a3bfac5a0be72a
+Subproject commit 87b1ff527a8110f592b4b5e2fcf13b8cd43b6d1f