This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from afec876951f Merge release branch 4.18 to main
add cee7a713aa2 server: clear resource reservation and increment resource
count in a transaction (#7724)
add 80ca3acf157 Allow encrypted volume migration for PowerFlex volumes
(#7757)
add f057f4b412e ui: fix userdata base64 encoding (#7749)
add 90baae3dcdf utils: fix RBD URI if credentials contains slash (#7708)
add 63216425d5b Set encrypted PowerFlex disk format correctly (#7735)
new 62a8f4ef72a Merge remote-tracking branch 'origin/4.18'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/cloudstack/context/CallContext.java | 5 +++
.../kvm/storage/KVMStorageProcessor.java | 3 ++
.../driver/ScaleIOPrimaryDataStoreDriver.java | 8 +---
.../cloud/resourcelimit/CheckedReservation.java | 20 ++++++---
.../resourcelimit/ResourceLimitManagerImpl.java | 31 +++++++++----
.../com/cloud/storage/VolumeApiServiceImpl.java | 11 ++---
.../cloud/storage/VolumeApiServiceImplTest.java | 52 ++++++++++++++++++++++
ui/src/utils/plugins.js | 8 ++++
ui/src/views/compute/AutoScaleVmProfile.vue | 10 +----
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 10 +----
ui/src/views/compute/DeployVM.vue | 3 +-
ui/src/views/compute/EditVM.vue | 3 +-
ui/src/views/compute/RegisterUserData.vue | 10 +----
ui/src/views/compute/ResetUserData.vue | 10 +----
ui/src/views/infra/AddPrimaryStorage.vue | 5 ---
utils/src/main/java/com/cloud/utils/UriUtils.java | 31 ++++++++-----
.../test/java/com/cloud/utils/UriUtilsTest.java | 14 +++++-
17 files changed, 151 insertions(+), 83 deletions(-)
