You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/06 16:03:47 UTC
git commit: updated refs/heads/master to b576e4d
Repository: cloudstack
Updated Branches:
refs/heads/master a01461708 -> b576e4d67
CLOUDSTACK-7854: Don't remove vm_template row for centos 5.5, mark as removed
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit fda4b9ba2c2884960d5709952233a5551e900ebd)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b576e4d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b576e4d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b576e4d6
Branch: refs/heads/master
Commit: b576e4d67e1201ff27865145e47b0c5d79557ca2
Parents: a014617
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 6 20:32:03 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 6 20:33:25 2014 +0530
----------------------------------------------------------------------
setup/db/db/schema-441to450.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b576e4d6/setup/db/db/schema-441to450.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-441to450.sql b/setup/db/db/schema-441to450.sql
index b523fd8..d9bc8e0 100644
--- a/setup/db/db/schema-441to450.sql
+++ b/setup/db/db/schema-441to450.sql
@@ -762,5 +762,5 @@ CREATE TABLE `cloud`.`baremetal_rct` (
--Remove duplicates from guest_os_hypervisor table
DELETE t1 FROM guest_os_hypervisor t1, guest_os_hypervisor t2 WHERE (t1.hypervisor_type = t2.hypervisor_type AND t1.hypervisor_version = t2.hypervisor_version AND t1.guest_os_id = t2.guest_os_id AND t1.id > t2.id AND t1.is_user_defined=0);
--- Delete redundant built-in CentOS 5.3 template (if any) for XenServer, since CentOS 5.6 template already exists
-DELETE FROM `cloud`.`vm_template` WHERE unique_name="centos53-x86_64" AND hypervisor_type="XenServer";
+-- Set as removed built-in CentOS 5.3 template (if any) for XenServer, since CentOS 5.6 template already exists
+UPDATE `cloud`.`vm_template` SET removed=NOW() WHERE unique_name="centos53-x86_64" AND hypervisor_type="XenServer";