From 2ed59218d623264d73e8f3354a7b455ebef63fab Mon Sep 17 00:00:00 2001 From: Gibson Chikafa Date: Mon, 18 Mar 2024 14:37:37 +0100 Subject: [PATCH] Fixx --- files/default/sql/ddl/updates/3.8.0.sql | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/files/default/sql/ddl/updates/3.8.0.sql b/files/default/sql/ddl/updates/3.8.0.sql index fd8a8d6a9..eb0335024 100644 --- a/files/default/sql/ddl/updates/3.8.0.sql +++ b/files/default/sql/ddl/updates/3.8.0.sql @@ -17,11 +17,10 @@ ALTER TABLE `hopsworks`.`feature_store_jdbc_connector` ADD COLUMN `secret_uid` INT DEFAULT NULL, ADD COLUMN `secret_name` VARCHAR(200) DEFAULT NULL; -<<<<<<< HEAD -- FSTORE-1248 ALTER TABLE `hopsworks`.`executions` ADD COLUMN `notebook_out_path` varchar(255) COLLATE latin1_general_cs DEFAULT NULL; -======= + -- HWORKS-927 ALTER TABLE `hopsworks`.`serving` DROP COLUMN `model_path`, @@ -67,4 +66,3 @@ CREATE TABLE `serving_spec` ( ALTER TABLE `hopsworks`.`serving` ADD CONSTRAINT `specification_fk` FOREIGN KEY (`specification`) REFERENCES `serving_spec` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION; ALTER TABLE `hopsworks`.`serving` ADD CONSTRAINT `canary_spec_fk` FOREIGN KEY (`canary_spec`) REFERENCES `serving_spec` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION; ->>>>>>> 23b86bb0 (Support canary serving deployments)