mirror of https://github.com/apache/cloudstack.git
8943cc6745
Conflicts: api/src/com/cloud/vm/VmCharacteristics.java core/src/com/cloud/dc/ClusterVO.java core/src/com/cloud/server/ManagementServer.java server/src/com/cloud/network/NetworkManager.java server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java |
||
|---|---|---|
| .. | ||
| create-database.sql | ||
| create-index-fk.sql | ||
| create-schema.sql | ||
| data-20to21.sql | ||
| data-21to22.sql | ||
| deploy-db-dev.sh | ||
| index-20to21.sql | ||
| index-21to22.sql | ||
| index-212to213.sql | ||
| postprocess-20to21.sql | ||
| schema-20to21.sql | ||
| schema-21to22.sql | ||
| schema-level.sql | ||
| server-setup.sql | ||
| server-setup.xml | ||
| templates.kvm.sql | ||
| templates.sql | ||
| templates.vmware.sql | ||
| templates.xenserver.sql | ||