From f2c43a04fa7b541d3098f865ef83159b8051d9f2 Mon Sep 17 00:00:00 2001 From: Marcus Williams Date: Fri, 3 May 2019 18:01:07 +0000 Subject: [PATCH] Update git submodules * Update docs/submodules/so.git from branch 'master' to 00b2538b48034dfb220a8ef179fb9627f93cb827 - Merge "Merge remote-tracking branch 'origin/dublin'" - Merge remote-tracking branch 'origin/dublin' merged dublin into master branch Change-Id: Ifb78d405611b65764fd4f01558b0e703551ed663 Issue-ID: SO-1830 Signed-off-by: Benjamin, Max (mb388a) Signed-off-by: Smokowski, Steve (ss835w) - Check to make sure Heat records do not exist. - Replaced index assert statements with stream(). - Updated the UT to retrieve from the service object for the assert statements. - Added check to make sure Heat records don't already exist. Change-Id: Ife02303e7b3f5c7d132fb9c1baebaa3787a18494 Issue-ID: SO-1818 Signed-off-by: Benjamin, Max (mb388a) - Merge "repeat distribution transaction error" into dublin - Merge "Do not need to retry on inventory exception" into dublin - repeat distribution transaction error implemented existence of tosca csar first before processing the notification implemented changes to verify if a csar already exists with tosca_csar table before processing the distribution. Updated code to set the SO component status when the csarIsAlreadyDeployed. Change-Id: I777ec603cb2f2f004adaa84e07196a961cebd646 Issue-ID: SO-1808 Signed-off-by: Benjamin, Max (mb388a) - Do not need to retry on inventory exception Do not need to retry on inventory exception due to vservers/linterfaces missing. Change-Id: I8e1e1d89ebd35e2b84a65e5e6db3e1db3f976982 Issue-ID: SO-1812 Signed-off-by: Benjamin, Max (mb388a) - Fix multicloud query of non-existant stack Fix handling of Not Found status for multicloud plugin query of a workload. Change-Id: Ie33b8728bf71fbcf0eaaa6496520351404928a36 Issue-ID: SO-1821 Signed-off-by: Eric Multanen - Merge "Add SO update config file -application.yaml file" into dublin - Add SO update config file -application.yaml file Added to Dublin branch- update the catalog-db-adapter -application.yaml file Remove the below line for flyway so that repeatable scripts are run. repeatableSqlMigrationPrefix: RATT Issue-ID: SO-1804 Signed-off-by: Bonkur, Venkat (vb8416) Change-Id: I54bd6d178d9f4c6854421f099bf393599d46d58f - Merge "Configuration object status to Inventoried" into dublin - Configuration object status to Inventoried Set initial OrchestrationStatus of Configuration object to Inventoried After Assign call, we need to set the configuration orchestration status to Assigned Change-Id: I4abaeb18d1d220b2bdd03269b3b5a2aba478bf64 Issue-ID: SO-1796 Signed-off-by: Benjamin, Max (mb388a) --- docs/submodules/so.git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/submodules/so.git b/docs/submodules/so.git index 38cefe5dd..00b2538b4 160000 --- a/docs/submodules/so.git +++ b/docs/submodules/so.git @@ -1 +1 @@ -Subproject commit 38cefe5dd2658490d00a0575f38179092668f118 +Subproject commit 00b2538b48034dfb220a8ef179fb9627f93cb827 -- 2.16.6