You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2012/06/21 22:55:58 UTC
git commit: CS-15181: Remove stale global config parameters from
upgrade script
Updated Branches:
refs/heads/master 791986268 -> 5697ff2ba
CS-15181: Remove stale global config parameters from upgrade script
Description:
Removing stale global config params.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5697ff2b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5697ff2b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5697ff2b
Branch: refs/heads/master
Commit: 5697ff2baf529869334fd97deeb799f82cadb2c7
Parents: 7919862
Author: Vijayendra Bhamidipati <vi...@citrix.com>
Authored: Thu Jun 21 13:54:42 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Thu Jun 21 13:55:52 2012 -0700
----------------------------------------------------------------------
setup/db/db/schema-302to303.sql | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5697ff2b/setup/db/db/schema-302to303.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-302to303.sql b/setup/db/db/schema-302to303.sql
index 32f68e6..d22d88d 100755
--- a/setup/db/db/schema-302to303.sql
+++ b/setup/db/db/schema-302to303.sql
@@ -121,9 +121,6 @@ DELETE FROM `cloud`.`configuration` WHERE name='xen.min.xapi.version';
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'enable.ec2.api', 'false', 'enable EC2 API on CloudStack');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'enable.s3.api', 'false', 'enable Amazon S3 API on CloudStack');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'vmware.use.nexus.vswitch', 'false', 'Enable/Disable Cisco Nexus 1000v vSwitch in VMware environment');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vmware.guest.network.vswitch.type', 'standard', 'Specify type of (standard/nexus) virtual switch designated for guest traffic');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vmware.private.network.vswitch.type','standard', 'Specify type of (standard/nexus) virtual switch designated for private traffic');
-INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vmware.public.network.vswitch.type', 'standard', 'Specify type of (standard/nexus) virtual switch designated for public traffic');
ALTER TABLE `cloud`.`account` ADD COLUMN `default_zone_id` bigint unsigned;
ALTER TABLE `cloud`.`account` ADD CONSTRAINT `fk_account__default_zone_id` FOREIGN KEY `fk_account__default_zone_id`(`default_zone_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE;