apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

Browse Source
This commit is contained in:
Alex Huang 2010-08-23 15:10:15 -07:00
commit e91617bc6f
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud.spec
View File

@ -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

43
core/.classpath
View File

@ -18,26 +18,27 @@
<classpathentry kind="lib" path="/thirdparty/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/commons-codec-1.4.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry kind="lib" path="/thirdparty/vmware/apputils.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/vim.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/vim25.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/activation.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/axis.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/jaxen-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/jaxen-jdom.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/jaxen.license"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/jaxen.readme"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/jaxrpc.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/jdom.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/mailapi.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/saxpath.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/smtp.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/wbem.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/xalan.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/xalan.license"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/xalan.readme"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/xerces.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/xerces.readme"/>
<classpathentry kind="lib" path="/thirdparty/vmware/lib/xml-apis.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-apputils.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-credstore.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-activation.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-axis.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-jaxen-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-jaxen-jdom.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-jaxen.license"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-jaxen.readme"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-jaxrpc.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-jdom.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-mailapi.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-saxpath.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-smtp.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-wbem.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-xalan.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-xalan.license"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-xalan.readme"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-xerces.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-xerces.readme"/>
<classpathentry kind="lib" path="/thirdparty/vmware-lib-xml-apis.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-vim.jar"/>
<classpathentry kind="lib" path="/thirdparty/vmware-vim25.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
server/src/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -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)