mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
353423acec
Conflicts: api/src/com/cloud/api/commands/ListFirewallRulesCmd.java api/src/com/cloud/api/response/FirewallResponse.java api/src/com/cloud/api/response/IPAddressResponse.java server/src/com/cloud/api/ApiDBUtils.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java server/src/com/cloud/network/dao/NetworkDaoImpl.java server/src/com/cloud/server/ManagementServerImpl.java
24 lines
523 B
XML
24 lines
523 B
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<projectDescription>
|
|
<name>ovm</name>
|
|
<comment></comment>
|
|
<projects>
|
|
</projects>
|
|
<buildSpec>
|
|
<buildCommand>
|
|
<name>org.python.pydev.PyDevBuilder</name>
|
|
<arguments>
|
|
</arguments>
|
|
</buildCommand>
|
|
<buildCommand>
|
|
<name>org.eclipse.jdt.core.javabuilder</name>
|
|
<arguments>
|
|
</arguments>
|
|
</buildCommand>
|
|
</buildSpec>
|
|
<natures>
|
|
<nature>org.eclipse.jdt.core.javanature</nature>
|
|
<nature>org.python.pydev.pythonNature</nature>
|
|
</natures>
|
|
</projectDescription>
|