cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [16/50] git commit: updated refs/heads/ui-cisco-asa1000v-support to ac07a54
Date Thu, 02 May 2013 17:31:22 GMT
CLOUDSTACK-2296: upgrade


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/817c46db
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/817c46db
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/817c46db

Branch: refs/heads/ui-cisco-asa1000v-support
Commit: 817c46db7c9fcc99d30b3ad174fb47d5fae684ce
Parents: 1cb9bd5
Author: Abhinandan Prateek <aprateek@apache.org>
Authored: Wed May 1 12:37:46 2013 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Wed May 1 12:37:46 2013 +0530

----------------------------------------------------------------------
 setup/db/db/schema-410to420.sql |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/817c46db/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 9a66a0f..2de6fe5 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -119,19 +119,18 @@ CREATE TABLE `cloud`.`load_balancer_healthcheck_policies` (
 
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'vm.instancename.flag', 'false', 'Append guest VM display Name (if set) to the internal name
of the VM');
 
-INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (165, UUID(),
6, 'Windows 8 (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (166, UUID(),
6, 'Windows 8 (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (167, UUID(),
6, 'Windows Server 2012 (64-bit)');
-INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (168, UUID(),
6, 'Windows Server 8 (64-bit)');
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES
("VmWare", 'Windows 8 (32-bit)', 165);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES
("VmWare", 'Windows 8 (64-bit)', 166);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES
("VmWare", 'Windows Server 2012 (64-bit)', 167);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES
("VmWare", 'Windows Server 8 (64-bit)', 168);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES
("XenServer", 'Windows 8 (32-bit)', 165);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES
("XenServer", 'Windows 8 (64-bit)', 166);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES
("XenServer", 'Windows Server 2012 (64-bit)', 167);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES
("XenServer", 'Windows Server 8 (64-bit)', 168);
-√
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (165,
UUID(), 6, 'Windows 8 (32-bit)');
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (166,
UUID(), 6, 'Windows 8 (64-bit)');
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (167,
UUID(), 6, 'Windows Server 2012 (64-bit)');
+INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (168,
UUID(), 6, 'Windows Server 8 (64-bit)');
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id)
VALUES ("VmWare", 'Windows 8 (32-bit)', 165);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id)
VALUES ("VmWare", 'Windows 8 (64-bit)', 166);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id)
VALUES ("VmWare", 'Windows Server 2012 (64-bit)', 167);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id)
VALUES ("VmWare", 'Windows Server 8 (64-bit)', 168);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id)
VALUES ("XenServer", 'Windows 8 (32-bit)', 165);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id)
VALUES ("XenServer", 'Windows 8 (64-bit)', 166);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id)
VALUES ("XenServer", 'Windows Server 2012 (64-bit)', 167);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id)
VALUES ("XenServer", 'Windows Server 8 (64-bit)', 168);
 
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (211, UUID(),
7, 'Apple Mac OS X 10.6 (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (212, UUID(),
7, 'Apple Mac OS X 10.6 (64-bit)');


Mime
View raw message