Repository: cloudstack Updated Branches: refs/heads/4.4 7c06ec5bc -> 8ad6b3c7e
Revert "CLOUDSTACK-6286: added FinishAggregationCommand and StartAggregationCommand to simulator" This reverts commit 9ddfbe11286b874ea7717ec3545daff4a20d3865. REverting as the dependency is not there in git. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8ad6b3c7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8ad6b3c7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8ad6b3c7 Branch: refs/heads/4.4 Commit: 8ad6b3c7e9be9b0d8ee90efc93c0508b00fc6524 Parents: 7c06ec5 Author: Abhinandan Prateek <aprat...@apache.org> Authored: Thu Apr 3 10:22:53 2014 +0530 Committer: Abhinandan Prateek <aprat...@apache.org> Committed: Thu Apr 3 10:23:42 2014 +0530 ---------------------------------------------------------------------- .../src/com/cloud/agent/manager/SimulatorManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ad6b3c7/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java index ca0eca2..cf1429a 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java +++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java @@ -369,8 +369,7 @@ public class SimulatorManagerImpl extends ManagerBase implements SimulatorManage return _mockNetworkMgr.setupPVLAN((PvlanSetupCommand)cmd); } else if (cmd instanceof StorageSubSystemCommand) { return this.storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd); - } else if (cmd instanceof VpnUsersCfgCommand || cmd instanceof RemoteAccessVpnCfgCommand || cmd instanceof SetMonitorServiceCommand || - cmd instanceof FinishAggregationCommand || cmd instanceof StartAggregationCommand) { + } else if (cmd instanceof VpnUsersCfgCommand || cmd instanceof RemoteAccessVpnCfgCommand || cmd instanceof SetMonitorServiceCommand) { return new Answer(cmd); } else { s_logger.error("Simulator does not implement command of type " + cmd.toString());
