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 |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| test_affinity_groups.py | ||
| test_deploy_vm.py | ||
| test_deploy_vm_with_userdata.py | ||
| test_disk_offerings.py | ||
| test_global_settings.py | ||
| test_guest_vlan_range.py | ||
| test_hosts.py | ||
| test_internal_lb.py | ||
| test_iso.py | ||
| test_network.py | ||
| test_network_acl.py | ||
| test_nic.py | ||
| test_nicdetail.py | ||
| test_non_contigiousvlan.py | ||
| test_primary_storage.py | ||
| test_privategw_acl.py | ||
| test_public_ip_range.py | ||
| test_pvlan.py | ||
| test_regions.py | ||
| test_resource_detail.py | ||
| test_routers.py | ||
| test_scale_vm.py | ||
| test_secondary_storage.py | ||
| test_service_offerings.py | ||
| test_ssvm.py | ||
| test_templates.py | ||
| test_vm_life_cycle.py | ||
| test_vm_snapshots.py | ||
| test_volumedetail.py | ||
| test_volumes.py | ||