cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to 952a853
Date Fri, 14 Aug 2015 07:47:31 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 869a83f8f -> 952a85339


CLOUDSTACK-8696: Port Rajani's regions fix to 451to452 sql upgrade path

Upgrade paths from 4.5.1 exists to both 4.5.2, and 4.6.0. Since 4.5.2 and 4.6.0
are not release, and the bug affects 4.5 branch; this patch aims to port that
fix from master to both 4.5/master branches.

Ported from commit b6a7804

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/master
Commit: 952a8533921709b65483764199c9bd7cdc3bc3b3
Parents: 869a83f
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri Aug 14 13:12:29 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Aug 14 13:16:58 2015 +0530

----------------------------------------------------------------------
 setup/db/db/schema-451to452.sql | 4 ++++
 setup/db/db/schema-452to460.sql | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/952a8533/setup/db/db/schema-451to452.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-451to452.sql b/setup/db/db/schema-451to452.sql
index 5c89008..d0aeabf 100644
--- a/setup/db/db/schema-451to452.sql
+++ b/setup/db/db/schema-451to452.sql
@@ -33,3 +33,7 @@ CREATE TABLE `cloud`.`saml_token` (
   PRIMARY KEY (`id`),
   CONSTRAINT `fk_saml_token__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`)
ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+SET foreign_key_checks = 0;
+ALTER TABLE `cloud`.`region` MODIFY `id` int unsigned UNIQUE NOT NULL;
+SET foreign_key_checks = 1;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/952a8533/setup/db/db/schema-452to460.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-452to460.sql b/setup/db/db/schema-452to460.sql
index 9009ba4..e013b2b 100644
--- a/setup/db/db/schema-452to460.sql
+++ b/setup/db/db/schema-452to460.sql
@@ -399,6 +399,3 @@ CREATE TABLE `cloud`.`external_bigswitch_bcf_devices` (
   CONSTRAINT `fk_external_bigswitch_bcf_devices__physical_network_id` FOREIGN KEY (`physical_network_id`)
REFERENCES `physical_network`(`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-SET foreign_key_checks = 0;
-ALTER TABLE `cloud`.`region` MODIFY `id` int unsigned UNIQUE NOT NULL;
-SET foreign_key_checks = 1;


Mime
View raw message