From: Michael Lando Date: Sun, 29 Jul 2018 15:37:27 +0000 (+0300) Subject: marge fix X-Git-Tag: 1.3.0~219 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F57951%2F1;p=sdc.git marge fix Change-Id: Ia0cf34de91f88c96e226c3075bb853e9024173be Issue-ID: SDC-1566 Signed-off-by: Michael Lando --- diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index ba9efe48ea..af1e5fadf7 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -25,7 +25,7 @@ beProtocol: http beSslPort: <%= @ssl_port %> version: 1.1.0 released: 2012-11-30 -toscaConformanceLevel: 8.0 +toscaConformanceLevel: 9.0 minToscaConformanceLevel: 3.0 titanCfgFile: /var/lib/jetty/config/catalog-be/titan.properties diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index 527857f13d..36cb54c788 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -23,7 +23,7 @@ beSslPort: 8443 version: 1.1.0 released: 2012-11-30 -toscaConformanceLevel: 8.0 +toscaConformanceLevel: 9.0 minToscaConformanceLevel: 3.0 # These values are necessary for running upgrade migration 1710.0 process