apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.19'

Browse Source
This commit is contained in:
Rohit Yadav 2024-06-10 16:18:41 +05:30
commit 8d211e75c0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
View File

@ -848,7 +848,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
destFile.setFormat(format); destFile.setFormat(format);
destFile.setSize(size); destFile.setSize(size);
Map<String, String> options = new HashMap<String, String>(); Map<String, String> options = new HashMap<String, String>();
if (pool.getType() == StoragePoolType.NetworkFilesystem){ if (List.of(StoragePoolType.NetworkFilesystem, StoragePoolType.Filesystem).contains(pool.getType())) {
options.put("preallocation", QemuImg.PreallocationType.getPreallocationType(provisioningType).toString()); options.put("preallocation", QemuImg.PreallocationType.getPreallocationType(provisioningType).toString());
} }

2
ui/public/locales/en.json
View File

@ -1375,7 +1375,7 @@
"label.miniops": "Min IOPS", "label.miniops": "Min IOPS",
"label.minmaxiops": "Min IOPS / Max IOPS", "label.minmaxiops": "Min IOPS / Max IOPS",
"label.minmembers": "Min members", "label.minmembers": "Min members",
"label.minmemory": "Min memory (in MB)", "label.minmemory": "Min. memory (MiB)",
"label.minorsequence": "Minor Sequence", "label.minorsequence": "Minor Sequence",
"label.minsize": "Minimum size", "label.minsize": "Minimum size",
"label.minute.past.hour": "minute(s) past the hour", "label.minute.past.hour": "minute(s) past the hour",