cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/master to 59d7c94
Date Sat, 22 Jun 2013 10:40:06 GMT
Updated Branches:
  refs/heads/master d22306344 -> 59d7c9424


CLOUDSTACK-3136: added Centsor 6.3 and Ubuntu 11.04 guest OS for Xen 6.1


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

Branch: refs/heads/master
Commit: 59d7c942470b9f07cc8abc257b739fe6a5d4f17e
Parents: d223063
Author: Abhinandan Prateek <aprateek@apache.org>
Authored: Sat Jun 22 16:04:55 2013 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Sat Jun 22 16:04:55 2013 +0530

----------------------------------------------------------------------
 .../xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java | 4 ++++
 setup/db/templates.sql                                          | 5 +++++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59d7c942/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
index 0f71c7b..8157de2 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
@@ -660,6 +660,8 @@ public class CitrixHelper {
         _xenServer610GuestOsMap.put("CentOS 6.1 (64-bit)", "CentOS 6 (64-bit)");
         _xenServer610GuestOsMap.put("CentOS 6.2 (32-bit)", "CentOS 6 (32-bit)");
         _xenServer610GuestOsMap.put("CentOS 6.2 (64-bit)", "CentOS 6 (64-bit)");
+        _xenServer610GuestOsMap.put("CentOS 6.3 (32-bit)", "CentOS 6 (32-bit)");
+        _xenServer610GuestOsMap.put("CentOS 6.3 (64-bit)", "CentOS 6 (64-bit)");
         _xenServer610GuestOsMap.put("Debian GNU/Linux 6(32-bit)", "Debian Squeeze 6.0 (32-bit)");
         _xenServer610GuestOsMap.put("Debian GNU/Linux 6(64-bit)", "Debian Squeeze 6.0 (64-bit)");
         _xenServer610GuestOsMap.put("Oracle Enterprise Linux 5.0 (32-bit)", "Oracle Enterprise
Linux 5 (32-bit)");
@@ -749,6 +751,8 @@ public class CitrixHelper {
         _xenServer610GuestOsMap.put("Ubuntu 10.10 (64-bit)", "Ubuntu Maverick Meerkat 10.10
(64-bit) (experimental)");
         _xenServer610GuestOsMap.put("Ubuntu 12.04 (32-bit)", "Ubuntu Precise Pangolin 12.04
(32-bit)");
         _xenServer610GuestOsMap.put("Ubuntu 12.04 (64-bit)", "Ubuntu Precise Pangolin 12.04
(64-bit)");
+        _xenServer610GuestOsMap.put("Ubuntu 11.04 (32-bit)", "Other install media");
+        _xenServer610GuestOsMap.put("Ubuntu 11.04 (64-bit)", "Other install media");
         _xenServer610GuestOsMap.put("Other Linux (32-bit)", "Other install media");
         _xenServer610GuestOsMap.put("Other Linux (64-bit)", "Other install media");
         _xenServer610GuestOsMap.put("Other (32-bit)", "Other install media");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59d7c942/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 1685dce..313a68d 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -219,6 +219,11 @@ INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name)
VALUES (166
 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` (id, category_id, display_name) VALUES (169, 10, 'Ubuntu 11.04
(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (170, 10, 'Ubuntu 11.04
(64-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (171, 1, 'CentOS 6.3
(32-bit)');
+INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (172, 1, 'CentOS 6.3
(64-bit)');
+
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (200, UUID(),
1, 'Other CentOS (32-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (201, UUID(),
1, 'Other CentOS (64-bit)');
 INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (202, UUID(),
5, 'Other SUSE Linux(32-bit)');


Mime
View raw message