Updated Branches:
refs/heads/master 1df520c8e -> d39026171
CS-15197: correct default value for service_offering.nw_rate
Reviewed-by: Will Chan
Conflicts:
setup/db/db/schema-302to303.sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d3902617
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d3902617
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d3902617
Branch: refs/heads/master
Commit: d39026171050a077a0ef935ae37c83c12ae9314d
Parents: 1df520c
Author: Alena Prokharchyk <[email protected]>
Authored: Mon Jun 4 09:29:48 2012 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Tue Jun 5 15:09:46 2012 -0700
----------------------------------------------------------------------
setup/db/db/schema-302to303.sql | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d3902617/setup/db/db/schema-302to303.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-302to303.sql b/setup/db/db/schema-302to303.sql
index 4aeb85f..32f68e6 100755
--- a/setup/db/db/schema-302to303.sql
+++ b/setup/db/db/schema-302to303.sql
@@ -172,3 +172,7 @@ CREATE TABLE `cloud`.`port_profile` (
`port_binding` varchar(20),
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+DELETE FROM `cloud`.`storage_pool_host_ref` WHERE pool_id IN (SELECT id FROM
storage_pool WHERE removed IS NOT NULL);
+
+ALTER TABLE `cloud`.`service_offering` MODIFY `nw_rate` smallint(5) unsigned
DEFAULT '200' COMMENT 'network rate throttle mbits/s';
