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 0BA13102FB for ; Tue, 25 Nov 2014 14:51:38 +0000 (UTC) Received: (qmail 46336 invoked by uid 500); 25 Nov 2014 14:51:37 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 46212 invoked by uid 500); 25 Nov 2014 14:51:37 -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 45850 invoked by uid 99); 25 Nov 2014 14:51:37 -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, 25 Nov 2014 14:51:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1F913A197FE; Tue, 25 Nov 2014 14:51:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Tue, 25 Nov 2014 14:51:41 -0000 Message-Id: <7c66fddc2b39495c80c2c27928c97890@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/18] git commit: updated refs/heads/4.3 to b8a28df CLOUDSTACK-7869: Add simulator support for findHostsForMigration API (cherry picked from commit 8378485e56d973639dfc06013d64db6a80056a3b) Signed-off-by: Rohit Yadav Conflicts: server/src/com/cloud/server/ManagementServerImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f0a81edb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0a81edb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0a81edb Branch: refs/heads/4.3 Commit: f0a81edb5b80acac4685a28fabeaad978c01a59f Parents: 1e47589 Author: Koushik Das Authored: Sat Nov 8 13:46:24 2014 +0530 Committer: Rohit Yadav Committed: Tue Nov 25 18:31:37 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/server/ManagementServerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0a81edb/server/src/com/cloud/server/ManagementServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 3744cb3..afa50b0 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1081,9 +1081,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe throw ex; } - if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) - && !vm.getHypervisorType().equals(HypervisorType.KVM) && !vm.getHypervisorType().equals(HypervisorType.Ovm) - && !vm.getHypervisorType().equals(HypervisorType.Hyperv)) { + if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM) + && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Hyperv) && !vm.getHypervisorType().equals(HypervisorType.LXC) + && !vm.getHypervisorType().equals(HypervisorType.Simulator)) { if (s_logger.isDebugEnabled()) { s_logger.debug(vm + " is not XenServer/VMware/KVM/OVM/Hyperv, cannot migrate this VM."); }