incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [17/50] [abbrv] git commit: refs/heads/vim51_win8 - CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges
Date Mon, 25 Feb 2013 20:46:46 GMT
CLOUDSTACK-1373: Fix regression in db-schema due to recent branch merges

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>


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 <bhaisaab@apache.org>
Authored: Fri Feb 22 19:11:40 2013 +0530
Committer: Rohit Yadav <bhaisaab@apache.org>
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';
 


Mime
View raw message