Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F29D610DE0 for ; Thu, 21 Nov 2013 22:11:04 +0000 (UTC) Received: (qmail 69019 invoked by uid 500); 21 Nov 2013 22:10:41 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 68395 invoked by uid 500); 21 Nov 2013 22:10:37 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 67258 invoked by uid 99); 21 Nov 2013 22:10:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Nov 2013 22:10:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8FDA59010D7; Thu, 21 Nov 2013 22:10:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 21 Nov 2013 22:11:32 -0000 Message-Id: <1ea8c8fac5e948c19bee241f5df53154@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [63/69] [abbrv] git commit: updated refs/heads/ui-restyle to c05482b 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 Authored: Thu Nov 21 18:59:31 2013 +0100 Committer: Wido den Hollander 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