Updated Branches:
refs/heads/4.1 43c762b65 -> 05ca08af1
CLOUDSTACK-1874: Removed region_id column from cloud_usage db account table
Conflicts:
setup/db/db/schema-40to410.sql
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05ca08af
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05ca08af
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05ca08af
Branch: refs/heads/4.1
Commit: 05ca08af1166d40a3e0708004789e30c3a11659e
Parents: 43c762b
Author: Kishan Kavala <kis...@cloud.com>
Authored: Fri Apr 5 13:57:27 2013 +0530
Committer: Chip Childers <chip.child...@gmail.com>
Committed: Fri Apr 5 16:52:05 2013 +0100
----------------------------------------------------------------------
setup/db/db/schema-40to410.sql | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05ca08af/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index 018406b..f327ce9 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -271,8 +271,6 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project
Defaults', 'DEFAULT'
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults',
'DEFAULT', 'management-server', 'max.project.memory', '40960', 'The default
maximum memory (in MB) that can be used for a project');
-ALTER TABLE `cloud_usage`.`account` ADD COLUMN `region_id` int unsigned NOT
NULL DEFAULT '1';
-
CREATE TABLE `cloud`.`nicira_nvp_router_map` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
`logicalrouter_uuid` varchar(255) NOT NULL UNIQUE COMMENT 'nicira uuid of
logical router',
