mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge remote-tracking branch 'origin/4.19'
This commit is contained in:
commit
8d211e75c0
@ -848,7 +848,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
|
||||
destFile.setFormat(format);
|
||||
destFile.setSize(size);
|
||||
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());
|
||||
}
|
||||
|
||||
|
||||
@ -1375,7 +1375,7 @@
|
||||
"label.miniops": "Min IOPS",
|
||||
"label.minmaxiops": "Min IOPS / Max IOPS",
|
||||
"label.minmembers": "Min members",
|
||||
"label.minmemory": "Min memory (in MB)",
|
||||
"label.minmemory": "Min. memory (MiB)",
|
||||
"label.minorsequence": "Minor Sequence",
|
||||
"label.minsize": "Minimum size",
|
||||
"label.minute.past.hour": "minute(s) past the hour",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user