summaryrefslogtreecommitdiffstats
path: root/docker/docker_be/chef-solo
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-05-24 15:12:28 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-24 15:12:28 +0000
commit6ada8ec44fad55cec2321231cb3b2eec48ccc1d1 (patch)
tree9cf309e17df21a7daa10c954a0ec88cf461b44e4 /docker/docker_be/chef-solo
parent1a0189f890e4ff65ee245be9b7ef67788ac53a61 (diff)
parenta0182011ebdf750e8d88adc0e6707f26dcaf1157 (diff)
Merge "Fix for OOM and Helm"
Diffstat (limited to 'docker/docker_be/chef-solo')
-rw-r--r--docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore (renamed from docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/traststore)bin4255 -> 4255 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/traststore b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore
index c408393..c408393 100644
--- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/traststore
+++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/files/default/truststore
Binary files differ