Updated Branches: refs/heads/vmsync 049dd7242 -> 4f709abd6
Merge fixes. Now started Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f709abd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f709abd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f709abd Branch: refs/heads/vmsync Commit: 4f709abd6abf9ed4c304c6a626f2456c85dafffd Parents: 049dd72 Author: Alex Huang <alex.hu...@gmail.com> Authored: Mon Jun 24 18:04:48 2013 -0700 Committer: Alex Huang <alex.hu...@gmail.com> Committed: Mon Jun 24 18:04:48 2013 -0700 ---------------------------------------------------------------------- .../storage/test/DirectAgentManagerSimpleImpl.java | 10 ---------- setup/db/db/schema-410to420.sql | 5 ----- 2 files changed, 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f709abd/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java index 8c4571f..e7d7b6d 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java @@ -34,14 +34,11 @@ import com.cloud.agent.StartupCommandProcessor; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.SetupCommand; -import com.cloud.agent.api.StartupCommand; -import com.cloud.agent.manager.AgentAttache; import com.cloud.agent.manager.Commands; import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.ClusterVO; import com.cloud.dc.dao.ClusterDao; import com.cloud.exception.AgentUnavailableException; -import com.cloud.exception.ConnectionException; import com.cloud.exception.DiscoveryException; import com.cloud.exception.OperationTimedoutException; import com.cloud.host.HostEnvironment; @@ -241,13 +238,6 @@ public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentMa } @Override - public AgentAttache handleDirectConnectAgent(HostVO host, StartupCommand[] cmds, ServerResource resource, - boolean forRebalance) throws ConnectionException { - // TODO Auto-generated method stub - return null; - } - - @Override public boolean agentStatusTransitTo(HostVO host, Event e, long msId) { // TODO Auto-generated method stub return false; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f709abd/setup/db/db/schema-410to420.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index 75088e5..3996042 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -94,11 +94,8 @@ CREATE TABLE `cloud`.`image_store` ( PRIMARY KEY(`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -<<<<<<< HEAD ALTER TABLE `cloud`.`async_job` ADD COLUMN `related` CHAR(40) NOT NULL; -ALTER TABLE `cloud`.`vm_template` ADD COLUMN `image_data_store_id` bigint unsigned; -======= CREATE TABLE `cloud`.`image_store_details` ( `id` bigint unsigned UNIQUE NOT NULL AUTO_INCREMENT COMMENT 'id', `store_id` bigint unsigned NOT NULL COMMENT 'store the detail is related to', @@ -228,8 +225,6 @@ CREATE TABLE `cloud`.`volume_store_ref` ( INDEX `i_volume_store_ref__volume_id`(`volume_id`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; ->>>>>>> master - ALTER TABLE `cloud`.`service_offering` ADD COLUMN `is_volatile` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'true if the vm needs to be volatile, i.e., on every reboot of vm from API root disk is discarded and creates a new root disk'; ALTER TABLE `cloud`.`networks` ADD COLUMN `network_cidr` VARCHAR(18) COMMENT 'The network cidr for the isolated guest network which uses IP Reservation facility.For networks not using IP reservation, network_cidr is always null.';
