cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject git commit: updated refs/heads/4.2 to 2a2fffe
Date Tue, 13 Aug 2013 10:01:41 GMT
Updated Branches:
  refs/heads/4.2 12b916043 -> 2a2fffe60


CLOUDSTACK-4268: Guest OS category of Other Ubuntu 32 bit is different in a fresh setup and
a setup upgraded from 4.1 to 4.2. Fixed the category id for Ubuntu on clean setup. Also made
change to address the problem for upgrade from 2.x.


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

Branch: refs/heads/4.2
Commit: 2a2fffe604beb7b3996ad97523847d86af18aea3
Parents: 12b9160
Author: Devdeep Singh <devdeep@gmail.com>
Authored: Tue Aug 13 15:30:36 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Tue Aug 13 15:30:36 2013 +0530

----------------------------------------------------------------------
 setup/db/db/schema-412to420.sql | 1 +
 setup/db/templates.sql          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a2fffe6/setup/db/db/schema-412to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-412to420.sql b/setup/db/db/schema-412to420.sql
index 5d957b6..fa2988e 100644
--- a/setup/db/db/schema-412to420.sql
+++ b/setup/db/db/schema-412to420.sql
@@ -292,6 +292,7 @@ CREATE TABLE `cloud`.`load_balancer_healthcheck_policies` (
 
 INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server',
'vm.instancename.flag', 'false', 'If set to true, will set guest VM\'s name as it appears
on the hypervisor, to its hostname');
 
+UPDATE `cloud`.`guest_os` SET category_id=10 where id=59;
 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)');

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a2fffe6/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 5bc2f67..e030852 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -109,7 +109,7 @@ INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(55,
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (56, UUID(),
6, 'Windows Vista (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (57, UUID(),
6, 'Windows XP SP2 (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (58, UUID(),
6, 'Windows XP SP3 (32-bit)');
-INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (59, UUID(),
7, 'Other Ubuntu (32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (59, UUID(),
10, 'Other Ubuntu (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (60, UUID(),
7, 'Other (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (61, UUID(),
6, 'Windows 2000 Server');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (62, UUID(),
6, 'Windows 98');


Mime
View raw message