You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pd...@apache.org on 2014/09/24 02:42:57 UTC
[1/2] git commit: updated refs/heads/master to b3c117a
Repository: cloudstack
Updated Branches:
refs/heads/master d2fbe5ccd -> b3c117a11
CLOUDSTACK-7574, CREATE TABLE cloud.baremetal_rct
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/872b48b0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/872b48b0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/872b48b0
Branch: refs/heads/master
Commit: 872b48b0c34d85d934344c8ccf33fa328d2748ed
Parents: d2fbe5c
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Tue Sep 23 09:16:01 2014 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Tue Sep 23 20:41:47 2014 -0400
----------------------------------------------------------------------
setup/db/db/schema-440to441.sql | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/872b48b0/setup/db/db/schema-440to441.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-440to441.sql b/setup/db/db/schema-440to441.sql
index 4460559..e98c102 100644
--- a/setup/db/db/schema-440to441.sql
+++ b/setup/db/db/schema-440to441.sql
@@ -167,3 +167,25 @@ 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(), 'LXC', 'default', 'FreeBSD 10', 226, now(), 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(), 'LXC', 'default', 'Other PV', 139, now(), 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(), 'LXC', 'default', 'Other PV', 140, now(), 0);
+
+-- Add missing OS/hypervisor mapping for OStype added in 4.3.0 and 4.4.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.2.0', 'CentOS 6 (32-bit)', 227, now(), 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.2.0', 'CentOS 6 (64-bit)', 228, now(), 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.2.0', 'Windows 8 (64-bit)', 229, now(), 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.2.0', 'Windows Server 2012 (64-bit)', 168, now(), 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.2.5', 'CentOS 6 (32-bit)', 227, now(), 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.2.5', 'CentOS 6 (64-bit)', 228, now(), 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.2.5', 'Windows 8 (64-bit)', 229, now(), 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.2.5', 'Windows Server 2012 (64-bit)', 168, now(), 0);
+
+-- should have been in schema-430to440.sql
+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;
+
+
[2/2] git commit: updated refs/heads/master to b3c117a
Posted by pd...@apache.org.
remove table baremetal_rct crate from schema-440to441.sql,already in 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/b3c117a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b3c117a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b3c117a1
Branch: refs/heads/master
Commit: b3c117a11eda3373a5a7187547a441be908f4453
Parents: 872b48b
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Tue Sep 23 20:38:40 2014 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Tue Sep 23 20:42:09 2014 -0400
----------------------------------------------------------------------
setup/db/db/schema-440to441.sql | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3c117a1/setup/db/db/schema-440to441.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-440to441.sql b/setup/db/db/schema-440to441.sql
index e98c102..d1ea8d3 100644
--- a/setup/db/db/schema-440to441.sql
+++ b/setup/db/db/schema-440to441.sql
@@ -178,14 +178,3 @@ 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.2.5', 'CentOS 6 (64-bit)', 228, now(), 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.2.5', 'Windows 8 (64-bit)', 229, now(), 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.2.5', 'Windows Server 2012 (64-bit)', 168, now(), 0);
-
--- should have been in schema-430to440.sql
-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;
-
-