mirror of https://github.com/apache/cloudstack.git
Conflicts: api/src/com/cloud/network/NetworkService.java api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java server/src/com/cloud/acl/DomainChecker.java server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java server/src/com/cloud/network/NetworkManager.java server/src/com/cloud/network/NetworkManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java |
||
|---|---|---|
| .. | ||
| dao | ||
| firewall | ||
| security | ||
| vpn | ||
| MockFirewallManagerImpl.java | ||
| MockNetworkManagerImpl.java | ||
| MockNetworkModelImpl.java | ||
| MockRulesManagerImpl.java | ||
| NetworkManagerTest.java | ||
| NetworkManagerTestComponentLibrary.java | ||
| NetworkModelTest.java | ||