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 35C4F1778C for ; Tue, 11 Nov 2014 12:03:46 +0000 (UTC) Received: (qmail 4078 invoked by uid 500); 11 Nov 2014 12:03:41 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 4000 invoked by uid 500); 11 Nov 2014 12:03:41 -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 3157 invoked by uid 99); 11 Nov 2014 12:03:41 -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, 11 Nov 2014 12:03:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06F589AC21A; Tue, 11 Nov 2014 12:03:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Tue, 11 Nov 2014 12:04:01 -0000 Message-Id: In-Reply-To: <6ac3de36fd044948a206f950eda30755@git.apache.org> References: <6ac3de36fd044948a206f950eda30755@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/50] [abbrv] git commit: updated refs/heads/statscollector-graphite to e06a814 CLOUDSTACK-7869: Add simulator support for findHostsForMigration API Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54ec268b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54ec268b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54ec268b Branch: refs/heads/statscollector-graphite Commit: 54ec268b7e1523bb2bb8cae216e173b34895d651 Parents: 4d08bb8 Author: Koushik Das Authored: Sat Nov 8 13:46:24 2014 +0530 Committer: Koushik Das Committed: Sat Nov 8 13:50:43 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/server/ManagementServerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54ec268b/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 697d1c4..deb2424 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -1123,7 +1123,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe } 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.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."); }