Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CD22210A4A for ; Wed, 2 Apr 2014 15:24:05 +0000 (UTC) Received: (qmail 77719 invoked by uid 500); 2 Apr 2014 15:24:05 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 77688 invoked by uid 500); 2 Apr 2014 15:24:04 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 77680 invoked by uid 99); 2 Apr 2014 15:24:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Apr 2014 15:24:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3CE458AF619; Wed, 2 Apr 2014 15:24:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aprateek@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4 to 1586f41 Date: Wed, 2 Apr 2014 15:24:03 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4 15aeaf25d -> 1586f419d 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/1586f419 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1586f419 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1586f419 Branch: refs/heads/4.4 Commit: 1586f419dc7e22a802c586c535f1c9dbeaee5228 Parents: 15aeaf2 Author: Abhinandan Prateek Authored: Wed Apr 2 20:38:19 2014 +0530 Committer: Abhinandan Prateek Committed: Wed Apr 2 20:42:49 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/1586f419/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());