[63/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b

[bf...@apache.org]

CLOUDSTACK-1302: Allow cache_mode to be NULL in the database

Not allowing this field to be NULL broke master due to the default
data which gets loaded into the database during initial startup of the
management server.

During generation of the XML for the VM it will however default to
'none' if NULL is passed


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

Branch: refs/heads/ui-restyle
Commit: 308b7a5c37e4af20315b68254140195948552e23
Parents: de6bf74
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Thu Nov 21 18:59:31 2013 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Nov 21 18:59:31 2013 +0100

----------------------------------------------------------------------
 setup/db/db/schema-430to440.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/308b7a5c/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 9bb9602..8098ad8 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -22,7 +22,7 @@
 -- Disable foreign key checking
 SET foreign_key_checks = 0;
 
-ALTER TABLE `cloud`.`disk_offering` ADD `cache_mode` VARCHAR( 16 ) NOT NULL DEFAULT 'none' COMMENT 'The disk cache mode to use for disks created with this offering';
+ALTER TABLE `cloud`.`disk_offering` ADD `cache_mode` VARCHAR( 16 ) DEFAULT 'none' COMMENT 'The disk cache mode to use for disks created with this offering';
 
 DROP VIEW IF EXISTS `cloud`.`disk_offering_view`;
 CREATE VIEW `cloud`.`disk_offering_view` AS