summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2019-02-24 23:06:45 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-24 23:06:45 +0000
commit36d2482016d2fc53fc823a85b486933a514061f4 (patch)
tree61785041a73b9ea45e54a602aaef524950345bfa
parentcb1af34a4ccb3ea07032d0a8b3bc37dc487fad57 (diff)
parentaf743296a14180d728430809434b977311597da3 (diff)
Merge changes I52c33d1d,I162e4119
* changes: Update fProxy keystore Update Babel image to latest STAGING
-rw-r--r--charts/aai-babel/values.yaml2
-rw-r--r--resources/config/fproxy/auth/tomcat_keystorebin2214 -> 3607 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/charts/aai-babel/values.yaml b/charts/aai-babel/values.yaml
index 8c192e5..8e5aa2d 100644
--- a/charts/aai-babel/values.yaml
+++ b/charts/aai-babel/values.yaml
@@ -25,7 +25,7 @@ global:
#################################################################
# application image
-image: onap/babel:1.3.2
+image: onap/babel:1.4-STAGING-latest
flavor: small
diff --git a/resources/config/fproxy/auth/tomcat_keystore b/resources/config/fproxy/auth/tomcat_keystore
index 9eec841..d68bf73 100644
--- a/resources/config/fproxy/auth/tomcat_keystore
+++ b/resources/config/fproxy/auth/tomcat_keystore
Binary files differ