You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/04/11 14:45:38 UTC
[cloudstack] 01/01: Merge release branch 4.13 to master
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit b984184b7acbe4b8295dec8681acc5c81c8b096b
Merge: 3d4b9af f18fe5e
Author: Daan Hoogland <da...@shapeblue.com>
AuthorDate: Sat Apr 11 16:45:00 2020 +0200
Merge release branch 4.13 to master
* 4.13:
Snapshot deletion issues (#3969)
server: Cannot list affinity group if there are hosts dedicated… (#4025)
server: Search zone-wide storage pool when allocation algothrim is firstfitleastconsumed (#4002)
.../java/com/cloud/capacity/dao/CapacityDao.java | 2 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 22 ++-
.../src/test/resources/fakeDriverTestContext.xml | 2 +-
.../src/test/resources/storageContext.xml | 2 +-
...tStrategy.java => DefaultSnapshotStrategy.java} | 176 +++++++++++++++------
...ing-engine-storage-snapshot-storage-context.xml | 4 +-
.../allocator/AbstractStoragePoolAllocator.java | 3 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 38 +++++
.../kvm/storage/KVMStorageProcessor.java | 62 +++++---
.../manager/allocator/impl/FirstFitAllocator.java | 3 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 2 +-
11 files changed, 225 insertions(+), 91 deletions(-)