cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [07/50] [abbrv] git commit: updated refs/heads/4.5 to 50ee981
Date Mon, 13 Oct 2014 04:41:24 GMT
cleaning more conflicts


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

Branch: refs/heads/4.5
Commit: dba4a8c8373dec0cd4f5ff60f47cf3445a4bab1c
Parents: 3540828
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Wed Sep 24 17:24:23 2014 +0200
Committer: David Nalley <david@gnsa.us>
Committed: Mon Oct 13 00:19:20 2014 -0400

----------------------------------------------------------------------
 .../framework/config/impl/ConfigurationVO.java        |  4 ++--
 setup/db/db/schema-440to441.sql                       | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dba4a8c8/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
----------------------------------------------------------------------
diff --git a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
index d7edfe0..cda96c9 100644
--- a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
+++ b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
@@ -43,10 +43,10 @@ public class ConfigurationVO implements Configuration {
     @Column(name = "name")
     private String name;
 
-    @Column(name = "value", length = 4095)
+    @Column(name = "value", length = 8191)
     private String value;
 
-    @Column(name = "default_value", length = 4095)
+    @Column(name = "default_value", length = 8191)
     private String defaultValue;
 
     @Column(name = "description", length = 1024)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dba4a8c8/setup/db/db/schema-440to441.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-440to441.sql b/setup/db/db/schema-440to441.sql
index 4460559..337d575 100644
--- a/setup/db/db/schema-440to441.sql
+++ b/setup/db/db/schema-440to441.sql
@@ -167,3 +167,17 @@ 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);
+
+-- Fix CLOUDSTACK-7624
+ALTER TABLE `cloud`.`configuration` MODIFY default_value varchar(8191), MODIFY value varchar(8191);


Mime
View raw message