mirror of https://github.com/apache/cloudstack.git
Conflicts: engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java setup/db/db/schema-441to450.sql test/integration/component/test_deploy_vgpu_vm.py tools/marvin/marvin/config/test_data.py |
||
|---|---|---|
| .. | ||
| acl/static-role-based | ||
| affinity-group-processors | ||
| alert-handlers | ||
| api | ||
| database/mysql-ha | ||
| dedicated-resources | ||
| deployment-planners | ||
| event-bus | ||
| file-systems/netapp | ||
| ha-planners/skip-heurestics | ||
| host-allocators/random | ||
| hypervisors | ||
| network-elements | ||
| storage | ||
| storage-allocators/random | ||
| user-authenticators | ||
| pom.xml | ||