Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46E3611BB3 for ; Tue, 23 Sep 2014 17:40:44 +0000 (UTC) Received: (qmail 37615 invoked by uid 500); 23 Sep 2014 17:40:39 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 37584 invoked by uid 500); 23 Sep 2014 17:40:38 -0000 Mailing-List: contact commits-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 commits@cloudstack.apache.org Received: (qmail 37575 invoked by uid 99); 23 Sep 2014 17:40:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Sep 2014 17:40:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 997C09379FF; Tue, 23 Sep 2014 17:40:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: frankzhang@apache.org To: commits@cloudstack.apache.org Message-Id: <8f12ea10e2ba4826bcb65ae7d46fe050@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 6f413c2 Date: Tue, 23 Sep 2014 17:40:38 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 5fb2b3a0d -> 6f413c22e CLOUDSTACK-6278 Baremetal Advanced Networking support move baremetal rct schema from schema-430to440.sql to schema-441to450.sql Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6f413c22 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6f413c22 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6f413c22 Branch: refs/heads/master Commit: 6f413c22e12d18404e0bc9b4a4d9e114f77d163c Parents: 5fb2b3a Author: Frank Zhang Authored: Tue Sep 23 10:43:42 2014 -0700 Committer: Frank Zhang Committed: Tue Sep 23 10:44:28 2014 -0700 ---------------------------------------------------------------------- setup/db/db/schema-430to440.sql | 7 ------- setup/db/db/schema-441to450.sql | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f413c22/setup/db/db/schema-430to440.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql index 0943518..ec10a3a 100644 --- a/setup/db/db/schema-430to440.sql +++ b/setup/db/db/schema-430to440.sql @@ -686,13 +686,6 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'CentOS 6.5 (64-bit)', 228); INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 6.5 (64-bit)', 228); -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 = InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`op_router_monitoring_services` ( `vm_id` bigint unsigned UNIQUE NOT NULL COMMENT 'Primary Key', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6f413c22/setup/db/db/schema-441to450.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-441to450.sql b/setup/db/db/schema-441to450.sql index 39ac88c..dbb6754 100644 --- a/setup/db/db/schema-441to450.sql +++ b/setup/db/db/schema-441to450.sql @@ -739,3 +739,10 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervis INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, storage_motion_supported) VALUES (UUID(), 'XenServer', '6.5.0', 100, 1, 13, 1); +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 = InnoDB DEFAULT CHARSET=utf8;