mirror of https://github.com/apache/cloudstack.git
aaf0d24a83
Conflicts: api/src/com/cloud/api/ApiConstants.java api/src/com/cloud/api/BaseCmd.java api/src/com/cloud/api/ResponseGenerator.java api/src/com/cloud/api/commands/AssociateIPAddrCmd.java api/src/com/cloud/api/commands/EnableStaticNatCmd.java api/src/com/cloud/event/EventTypes.java api/src/com/cloud/network/NetworkService.java api/src/com/cloud/network/rules/RulesService.java client/tomcatconf/commands.properties.in core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java scripts/vm/hypervisor/xenserver/xenserver56fp1/patch server/src/com/cloud/api/ApiDBUtils.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/network/rules/RulesManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java server/src/com/cloud/upgrade/dao/Upgrade2214to30.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java setup/db/create-schema.sql wscript |
||
|---|---|---|
| .. | ||
| catalina.policy.in | ||
| catalina.properties.in | ||
| cisconexusvsm_commands.properties.in | ||
| classpath.conf.in | ||
| cloudmanagementserver.keystore | ||
| commands-ext.properties.in | ||
| commands.properties.in | ||
| components-cloudzones.xml.in | ||
| components.xml.in | ||
| context.xml.in | ||
| db.properties.in | ||
| ehcache.xml.in | ||
| environment.properties.in | ||
| f5bigip_commands.properties.in | ||
| junipersrx_commands.properties.in | ||
| log4j-cloud.xml.in | ||
| logging.properties.in | ||
| netscalerloadbalancer_commands.properties.in | ||
| server-nonssl.xml | ||
| server-ssl.xml.in | ||
| server.xml.in | ||
| simulator.properties.in | ||
| tomcat-users.xml.in | ||
| tomcat6-nonssl.conf.in | ||
| tomcat6-ssl.conf.in | ||
| virtualrouter_commands.properties.in | ||
| web.xml.in | ||