cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/master to ac4f940
Date Wed, 30 Apr 2014 22:46:22 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 91d7d2b51 -> ac4f940c9


Remove accidentally added columns while resolving merge conflicts
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com>


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

Branch: refs/heads/master
Commit: ac4f940c9d4dec950c8bcb0648633e0c1a33bf2e
Parents: 91d7d2b
Author: Amogh Vasekar <amogh.vasekar@citrix.com>
Authored: Wed Apr 30 15:42:09 2014 -0700
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Wed Apr 30 15:43:21 2014 -0700

----------------------------------------------------------------------
 setup/db/db/schema-430to440.sql | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac4f940c/setup/db/db/schema-430to440.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 711919e..07791ed 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -774,8 +774,6 @@ ALTER TABLE `cloud`.`networks` ADD COLUMN streched_l2 boolean default
false;
 ALTER TABLE `cloud`.`vpc` ADD COLUMN region_level_vpc boolean default false;
 INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description,
default_value) VALUES ('Advanced', 'DEFAULT', 'NetworkOrchestrationService', 'router.redundant.vrrp.interval',
'1', 'seconds between VRRP broadcast. It would 3 times broadcast fail to trigger fail-over
mechanism of redundant router', '1') ON DUPLICATE KEY UPDATE category='Advanced';
 INSERT INTO `cloud`.`configuration`(category, instance, component, name, value, description,
default_value) VALUES ('Advanced', 'DEFAULT', 'NetworkOrchestrationService', 'router.aggregation.command.each.timeout',
'3', 'timeout in seconds for each Virtual Router command being aggregated. The final aggregation
command timeout would be determined by this timeout * commands counts ', '3') ON DUPLICATE
KEY UPDATE category='Advanced';
-ALTER TABLE `cloud`.`load_balancer_vm_map` ADD COLUMN instance_ip VARCHAR(40);
-ALTER TABLE `cloud`.`load_balancer_vm_map` DROP KEY `load_balancer_id`, ADD UNIQUE KEY load_balancer_id
(`load_balancer_id`, `instance_id`, `instance_ip`);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version,
guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', 'XCP 1.0',
'CentOS 4.5 (32-bit)', 1, now(), 0);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version,
guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', 'XCP 1.0',
'CentOS 4.6 (32-bit)', 2, now(), 0);
 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version,
guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(),'Xenserver', 'XCP 1.0',
'CentOS 4.7 (32-bit)', 3, now(), 0);


Mime
View raw message