mirror of https://github.com/apache/cloudstack.git
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| dao | ||
| MockConfigurationManagerImpl.java | ||
| MockNetworkManagerImpl.java | ||
| MockNetworkModelImpl.java | ||
| MockResourceLimitManagerImpl.java | ||
| MockSite2SiteVpnManagerImpl.java | ||
| MockSite2SiteVpnServiceProvider.java | ||
| MockVpcVirtualNetworkApplianceManager.java | ||
| NetworkACLManagerTest.java | ||
| NetworkACLServiceTest.java | ||
| Site2SiteVpnTest.java | ||
| VpcApiUnitTest.java | ||
| VpcTestConfiguration.java | ||