Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2714F10EAB for ; Thu, 27 Nov 2014 09:32:54 +0000 (UTC) Received: (qmail 22961 invoked by uid 500); 27 Nov 2014 09:32:53 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 22915 invoked by uid 500); 27 Nov 2014 09:32:53 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 22903 invoked by uid 99); 27 Nov 2014 09:32:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2014 09:32:53 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of trippie@gmail.com designates 209.85.212.172 as permitted sender) Received: from [209.85.212.172] (HELO mail-wi0-f172.google.com) (209.85.212.172) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2014 09:32:48 +0000 Received: by mail-wi0-f172.google.com with SMTP id n3so15082902wiv.11 for ; Thu, 27 Nov 2014 01:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:content-type:subject:message-id:date:to:mime-version; bh=VVLD5+TQQUwyLMrBZZdq/w8ITD98hCrLZLUyr48oSD0=; b=xhxC5Ai8dPWyQe5YHjRrYE57dV/IM/sMWSIn9y9k1m9e/X6AjDnSzElsNsFsciQLAE PrQZvtVSJDYnxnFjHUSjAGAm0AflI/8wiZK1b8hWmC9RKHjwBljyuC8AdzqyMSzcNZ6Q 3JOu4lO6rDYB5VrTWTFPsqfe+73Ik15W7a9KhF/O09di2mTlyrid2n7KENnCOKox441J sq82fquhvZB7Gtsx/LD/G7qYIo6YhBRkN/5zHX3SLCSPVdzApL19CJV3oUzHaCmmCmwy fLVukfqgSJbaWOrBROZk/wX/Xen9dTk+N9M9wBpkq+NsZX1QwCLTwH8jAmtFi3byj+tx qNYQ== X-Received: by 10.180.89.180 with SMTP id bp20mr11104887wib.78.1417080747270; Thu, 27 Nov 2014 01:32:27 -0800 (PST) Received: from [10.10.1.215] ([95.142.96.53]) by mx.google.com with ESMTPSA id fk16sm10778888wic.16.2014.11.27.01.32.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Nov 2014 01:32:26 -0800 (PST) Sender: Trippie From: Hugo Trippaers X-Google-Original-From: Hugo Trippaers Content-Type: multipart/alternative; boundary="Apple-Mail=_A8BB980D-7FC5-4B8F-8EE2-5E565BC8334C" Subject: Differences in schema-442to450.sql between 4.5 and master Message-Id: Date: Thu, 27 Nov 2014 10:32:24 +0100 To: "" Mime-Version: 1.0 (Mac OS X Mail 8.1 \(1993\)) X-Mailer: Apple Mail (2.1993) X-Virus-Checked: Checked by ClamAV on apache.org --Apple-Mail=_A8BB980D-7FC5-4B8F-8EE2-5E565BC8334C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii See this diff: Hugos-MacBook-Pro-7:cloudstack hugo (master)$ git diff master 4.5 = setup/db/db/schema-442to450.sql diff --git a/setup/db/db/schema-442to450.sql = b/setup/db/db/schema-442to450.sql index f84bca6..083943b 100644 --- a/setup/db/db/schema-442to450.sql +++ b/setup/db/db/schema-442to450.sql @@ -753,8 +753,6 @@ INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, = category_id, display_name, crea INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, = display_name, created) VALUES (247, UUID(), 3, 'Oracle Linux 7', = utc_timestamp()); INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, = display_name, created) VALUES (248, UUID(), 1, 'CentOS 6 (32-bit)', = utc_timestamp()); INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, = display_name, created) VALUES (249, UUID(), 1, 'CentOS 6 (64-bit)', = utc_timestamp()); -INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, = display_name, created) VALUES (250, UUID(), 3, 'Oracle Enterprise Linux = 6.5 (32-bit)', utc_timestamp()); -INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, = display_name, created) VALUES (251, UUID(), 3, 'Oracle Enterprise Linux = 6.5 (64-bit)', utc_timestamp()); =20 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 @@ -837,8 +835,6 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` = (uuid,hypervisor_type, hypervis INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 -INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 -INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, = hypervisor_version, guest_os_name, guest_os_id, created, = is_user_defined) VALUES (UUID(),'Xenserver', '6.5.0 @@ -935,16 +931,6 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` = (uuid,hypervisor_type, hypervis =20 INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, = hypervisor_type, hypervisor_version, max_guests_limit, = security_group_enabled, max_data_volumes_limit, storage_motion_sup =20 -update vlan set vlan_id=3Dconcat('vlan://', vlan_id) where vlan_type =3D = "VirtualNetwork" and vlan_id not like "vlan://%"; - -CREATE TABLE `cloud`.`baremetal_rct` ( - `id` bigint unsigned UNIQUE AUTO_INCREMENT, - `uuid` varchar(40) UNIQUE NOT NULL, - `url` varchar(2048) NOT NULL, - `rct` text NOT NULL, - PRIMARY KEY (`id`) -) ENGINE =3D InnoDB DEFAULT CHARSET=3Dutf8; - --Remove duplicates from guest_os_hypervisor table DELETE t1 FROM guest_os_hypervisor t1, guest_os_hypervisor t2 WHERE = (t1.hypervisor_type =3D t2.hypervisor_type AND t1.hypervisor_version =3D = t2.hypervisor_version AND t1.guest_os_id =3D=20 =20 @@ -958,9 +944,6 @@ ALTER TABLE `cloud`.`user_vm_details` MODIFY `value` = VARCHAR(5120); =20 UPDATE `cloud`.`host` SET resource =3D REPLACE(resource, = 'com.cloud.hypervisor.xen.resource', = 'com.cloud.hypervisor.xenserver.resource') WHERE = hypervisor_type=3D'XenServer' AND REMOVED =20 -INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, = created, type, hvm, bits, account_id, url, checksum, enable_password, = display_text, format, guest_os_id, fe - VALUES (11, UUID(), 'centos7-x86_64-lxc', 'CentOS 7(64-bit) no GUI = (LXC)', 1, now(), 'BUILTIN', 0, 64, 1, = 'http://download.cloud.com/templates/builtin/centos-7-x86_64.tar.gz',=20 - --Support for RHEL 6.5 in relevant hypervisor versions INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, = display_name, created) VALUES (252, UUID(), 4, 'Red Hat Enterprise Linux = 6.5 (32-bit)', utc_timestamp()); INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, = display_name, created) VALUES (253, UUID(), 4, 'Red Hat Enterprise Linux = 6.5 (64-bit)', utc_timestamp()); Can everybody who made changes to this file check and fix? Cheers, Hugo= --Apple-Mail=_A8BB980D-7FC5-4B8F-8EE2-5E565BC8334C--