cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 0c3d0cc
Date Tue, 23 Sep 2014 08:53:16 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 0d5a435f7 -> 0c3d0cc95


CLOUDSTACK-6603 [Upgrade]DB Exception while Autoscale monitoring after upgrading from 4.3
to 4.4

(cherry picked from commit c282bb3a1293fbbfdb306263ea52464862670fb3)
(cherry picked from commit fc7d0b2a333e510619f14528a72e35bbf9ed7045)


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

Branch: refs/heads/master
Commit: 0c3d0cc954b7c276640a71b636f78928f55e97a2
Parents: 0d5a435
Author: Rajesh Battala <rajesh.battala@citrix.com>
Authored: Mon Jun 9 14:42:16 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Tue Sep 23 10:53:02 2014 +0200

----------------------------------------------------------------------
 setup/db/db/schema-40to410.sql  | 1 -
 setup/db/db/schema-430to440.sql | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c3d0cc9/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index 65fb350..53b4a1a 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -367,7 +367,6 @@ CREATE TABLE `cloud`.`autoscale_vmgroups` (
   `max_members` int unsigned NOT NULL,
   `member_port` int unsigned NOT NULL,
   `interval` int unsigned NOT NULL,
-  `last_interval` datetime DEFAULT NULL,
   `profile_id` bigint unsigned NOT NULL,
   `state` varchar(255) NOT NULL COMMENT 'enabled or disabled, a vmgroup is disabled to stop
autoscaling activity',
   `created` datetime NOT NULL COMMENT 'date created',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c3d0cc9/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index a99ec28..0943518 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -662,6 +662,7 @@ ALTER TABLE `cloud`.`vpc` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT
'1' C
 ALTER TABLE `cloud`.`firewall_rules` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1'
COMMENT 'True if the rule can be displayed to the end user';
 ALTER TABLE `cloud`.`autoscale_vmgroups` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT
'1' COMMENT 'True if the entry can be displayed to the end user';
 ALTER TABLE `cloud`.`autoscale_vmprofiles` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT
'1' COMMENT 'True if the entry can be displayed to the end user';
+ALTER TABLE `cloud`.`autoscale_vmgroups` ADD COLUMN `last_interval` datetime NULL DEFAULT
NULL COMMENT 'last updated time';
 ALTER TABLE `cloud`.`network_acl_item` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1'
COMMENT 'True if the entry can be displayed to the end user';
 ALTER TABLE `cloud`.`network_acl` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT '1' COMMENT
'True if the entry can be displayed to the end user';
 ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `display` tinyint(1) NOT NULL DEFAULT
'1' COMMENT 'True if the entry can be displayed to the end user';


Mime
View raw message