cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/master to 228aa07
Date Thu, 03 Apr 2014 04:52:04 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master a82a1299e -> 228aa0715


Revert "CLOUDSTACK-6286: added FinishAggregationCommand and StartAggregationCommand to simulator"

This reverts commit 1586f419dc7e22a802c586c535f1c9dbeaee5228. Reverting as the commit that
includes the two classes is missing.


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

Branch: refs/heads/master
Commit: 228aa07153ae9ece8bfbd847f86cf8e4a1a48777
Parents: a82a129
Author: Abhinandan Prateek <aprateek@apache.org>
Authored: Thu Apr 3 10:18:50 2014 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Thu Apr 3 10:21:16 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/228aa071/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());


Mime
View raw message