From 27b038efcb598852622eb61df35ca0019e0a6b4e Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 23 Aug 2010 14:07:35 -0700 Subject: [PATCH 1/3] Correcting hypervisor type enum --- server/src/com/cloud/agent/manager/AgentManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 01ca1820670..7bdd846d2c0 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -1683,7 +1683,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory { // If this command is from a KVM agent, or from an agent that has a // null hypervisor type, don't do the CIDR check - if (hypervisorType == null || hypervisorType == Hypervisor.Type.KVM || hypervisorType == Hypervisor.Type.VMware) + if (hypervisorType == null || hypervisorType == Hypervisor.Type.KVM || hypervisorType == Hypervisor.Type.VmWare) doCidrCheck = false; if (doCidrCheck) From 8eb1e27b3c96ab0ce6cbf8ffad3959e996e78a63 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Mon, 23 Aug 2010 14:16:43 -0700 Subject: [PATCH 2/3] Update eclipse project classpath file to work with renamed vmware jar files --- core/.classpath | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/core/.classpath b/core/.classpath index d5ea1df23fc..d21c3e31c11 100644 --- a/core/.classpath +++ b/core/.classpath @@ -18,26 +18,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + From a9a22c7c81a2262b31da419084e308bfc5311032 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Mon, 23 Aug 2010 15:02:10 -0700 Subject: [PATCH 3/3] fedora 12 is the test for dependency of cloud-qemu --- cloud.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud.spec b/cloud.spec index fd215a8ddfa..1901f9f1ca7 100644 --- a/cloud.spec +++ b/cloud.spec @@ -232,7 +232,7 @@ Requires: %{name}-daemonize Requires: /sbin/service Requires: /sbin/chkconfig Requires: kvm -%if 0%{?fedora} >= 13 +%if 0%{?fedora} >= 12 Requires: cloud-qemu-system-x86 %endif Requires: libcgroup