mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
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