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 9ddfbe1
Date Wed, 02 Apr 2014 15:10:58 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master ca1b911a4 -> 9ddfbe112


CLOUDSTACK-6286: added FinishAggregationCommand and StartAggregationCommand to simulator


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

Branch: refs/heads/master
Commit: 9ddfbe11286b874ea7717ec3545daff4a20d3865
Parents: ca1b911
Author: Abhinandan Prateek <aprateek@apache.org>
Authored: Wed Apr 2 20:38:19 2014 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Wed Apr 2 20:38:19 2014 +0530

----------------------------------------------------------------------
 .../src/com/cloud/agent/manager/SimulatorManagerImpl.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9ddfbe11/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 cf1429a..ca0eca2 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
@@ -369,7 +369,8 @@ 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) {
+            } else if (cmd instanceof VpnUsersCfgCommand || cmd instanceof RemoteAccessVpnCfgCommand
|| cmd instanceof SetMonitorServiceCommand ||
+                    cmd instanceof FinishAggregationCommand || cmd instanceof StartAggregationCommand)
{
                 return new Answer(cmd);
             } else {
                 s_logger.error("Simulator does not implement command of type " + cmd.toString());


Mime
View raw message