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 |
||
|---|---|---|
| .. | ||
| acl/static-role-based | ||
| affinity-group-processors/host-anti-affinity | ||
| alert-handlers | ||
| api | ||
| deployment-planners | ||
| event-bus/rabbitmq | ||
| file-systems/netapp | ||
| host-allocators/random | ||
| hypervisors | ||
| network-elements | ||
| storage | ||
| storage-allocators/random | ||
| user-authenticators | ||
| pom.xml | ||