git commit: updated refs/heads/4.5 to 318f715

[bh...@apache.org]

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 e6533b368 -> 318f7159a


CLOUDSTACK-7854: Don't have CentOS 5.3 built-in template when we've 5.6

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/318f7159
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/318f7159
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/318f7159

Branch: refs/heads/4.5
Commit: 318f7159a0f1456e1058e6dee43887b4683310de
Parents: e6533b3
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 6 17:43:06 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 6 17:44:46 2014 +0530

----------------------------------------------------------------------
 setup/db/db/schema-441to450.sql | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/318f7159/setup/db/db/schema-441to450.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-441to450.sql b/setup/db/db/schema-441to450.sql
index 5caaa9f..7f60f85 100644
--- a/setup/db/db/schema-441to450.sql
+++ b/setup/db/db/schema-441to450.sql
@@ -751,3 +751,6 @@ INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hype
 
 --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";