mirror of https://github.com/apache/cloudstack.git
cadca5fc0c
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 |
||
|---|---|---|
| .. | ||
| dns-notifier | ||
| elastic-loadbalancer | ||
| f5 | ||
| juniper-srx | ||
| midokura-midonet | ||
| netscaler | ||
| nicira-nvp | ||
| ovs | ||