mirror of https://github.com/apache/cloudstack.git
Conflicts: api/src/org/apache/cloudstack/api/ResponseGenerator.java server/src/com/cloud/api/ApiResponseHelper.java server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/network/addr/PublicIp.java server/src/com/cloud/server/ManagementServerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockConfigurationManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java setup/db/db/schema-410to420.sql |
||
|---|---|---|
| .. | ||
| dao | ||
| MockConfigurationManagerImpl.java | ||
| MockNetworkManagerImpl.java | ||
| MockNetworkModelImpl.java | ||
| MockResourceLimitManagerImpl.java | ||
| MockSite2SiteVpnManagerImpl.java | ||
| MockSite2SiteVpnServiceProvider.java | ||
| MockVpcManagerImpl.java | ||
| MockVpcVirtualNetworkApplianceManager.java | ||
| NetworkACLManagerTest.java | ||
| NetworkACLServiceTest.java | ||
| Site2SiteVpnTest.java | ||
| VpcApiUnitTest.java | ||
| VpcTest.java | ||
| VpcTestConfiguration.java | ||