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 93C8E109F6 for ; Tue, 8 Apr 2014 12:28:10 +0000 (UTC) Received: (qmail 62635 invoked by uid 500); 8 Apr 2014 12:26:41 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 62048 invoked by uid 500); 8 Apr 2014 12:26:22 -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 56439 invoked by uid 99); 8 Apr 2014 12:25:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Apr 2014 12:25:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E63AE94DF28; Tue, 8 Apr 2014 12:25:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: talluri@apache.org To: commits@cloudstack.apache.org Date: Tue, 08 Apr 2014 12:25:39 -0000 Message-Id: <94ed63c0754140f5b84e11cc321aac17@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/60] [abbrv] git commit: updated refs/heads/marvin to 0e223d6 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/marvin Commit: 228aa07153ae9ece8bfbd847f86cf8e4a1a48777 Parents: a82a129 Author: Abhinandan Prateek Authored: Thu Apr 3 10:18:50 2014 +0530 Committer: Abhinandan Prateek 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());