Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4A3DA91D4 for ; Mon, 25 Feb 2013 20:46:57 +0000 (UTC) Received: (qmail 44740 invoked by uid 500); 25 Feb 2013 20:46:48 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 44636 invoked by uid 500); 25 Feb 2013 20:46:47 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 43714 invoked by uid 99); 25 Feb 2013 20:46:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Feb 2013 20:46:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CB01682FE5D; Mon, 25 Feb 2013 20:46:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [17/50] [abbrv] git commit: refs/heads/vim51_win8 - CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges Message-Id: <20130225204646.CB01682FE5D@tyr.zones.apache.org> Date: Mon, 25 Feb 2013 20:46:46 +0000 (UTC) CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5f8a2ee9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5f8a2ee9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5f8a2ee9 Branch: refs/heads/vim51_win8 Commit: 5f8a2ee9be490f7ecf7ada2e0847e76ac5b81fed Parents: bc4abcf Author: Rohit Yadav Authored: Fri Feb 22 19:11:40 2013 +0530 Committer: Rohit Yadav Committed: Fri Feb 22 19:15:01 2013 +0530 ---------------------------------------------------------------------- setup/db/create-schema.sql | 1 - setup/db/db/schema-410to420.sql | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5f8a2ee9/setup/db/create-schema.sql ---------------------------------------------------------------------- diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index 1556913..7361681 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -1049,7 +1049,6 @@ CREATE TABLE `cloud`.`vm_template` ( `source_template_id` bigint unsigned COMMENT 'Id of the original template, if this template is created from snapshot', `template_tag` varchar(255) COMMENT 'template tag', `sort_key` int(32) NOT NULL default 0 COMMENT 'sort key used for customising sort method', - `image_data_store_id` bigint unsigned, PRIMARY KEY (`id`), INDEX `i_vm_template__removed`(`removed`), CONSTRAINT `uc_vm_template__uuid` UNIQUE (`uuid`) http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5f8a2ee9/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index 461de7f..fd96d31 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -75,6 +75,7 @@ CREATE TABLE `cloud`.`image_data_store` ( CONSTRAINT `fk_tags__image_data_store_provider_id` FOREIGN KEY(`image_provider_id`) REFERENCES `data_store_provider`(`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE `cloud`.`vm_template` ADD COLUMN `image_data_store_id` bigint unsigned; ALTER TABLE `cloud`.`service_offering` ADD COLUMN `is_volatile` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'true if the vm needs to be volatile, i.e., on every reboot of vm from API root disk is discarded and creates a new root disk';