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 diff --git a/core/.classpath b/core/.classpath index d5ea1df23fc..d21c3e31c11 100644 --- a/core/.classpath +++ b/core/.classpath @@ -18,26 +18,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + 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)