cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 8378485
Date Sat, 08 Nov 2014 08:17:28 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 6a6d4d876 -> 8378485e5


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/8378485e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8378485e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8378485e

Branch: refs/heads/master
Commit: 8378485e56d973639dfc06013d64db6a80056a3b
Parents: 49115e0
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:46:54 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/8378485e/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