etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge error

This commit is contained in:
nvazquez 2025-05-11 21:03:35 -03:00
parent bfa6f52766
commit fd730a048d
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql
View File

@ -38,8 +38,6 @@ WHERE rp.rule = 'quotaStatement'
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'last_mgmt_server_id', 'bigint unsigned DEFAULT NULL COMMENT "last management server this host is connected to" AFTER `mgmt_server_id`');
<<<<<<< HEAD
-----------------------------------------------------------
-- CKS Enhancements:
-----------------------------------------------------------