mirror of https://github.com/apache/cloudstack.git
Conflicts: scripts/vm/hypervisor/xenserver/xenserver60/patch server/src/com/cloud/network/NetworkManager.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/network/vpc/VpcManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java |
||
|---|---|---|
| .. | ||
| 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 | ||