diff options
| author |   Michael Lando <ml636r@att.com> | 2018-07-29 18:37:27 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-07-29 18:37:27 +0300 |
| commit | 5290ce0a6d41620161602cf8bba1d7414cf82b0f (patch) | |
| tree | 9999899e8255a81be3c0d8a3f43eebf423cb4401 | |
| parent | 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b (diff) | |
marge fix
Change-Id: Ia0cf34de91f88c96e226c3075bb853e9024173be
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>
| -rw-r--r-- | catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb | 2 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/config/configuration.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |