mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
status 9623: resolved fixed Also set ram_size to 1024 for console proxy offering during the upgrade Conflicts: core/src/com/cloud/vm/SecondaryStorageVmVO.java server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java