cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [21/25] git commit: updated refs/heads/master to 55b6e34
Date Mon, 10 Nov 2014 09:36:59 GMT
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/master
Commit: 54ec268b7e1523bb2bb8cae216e173b34895d651
Parents: 4d08bb8
Author: Koushik Das <koushik@apache.org>
Authored: Sat Nov 8 13:46:24 2014 +0530
Committer: Koushik Das <koushik@apache.org>
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.");
             }


Mime
View raw message