This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 62a8f4ef72a49e6c8180db4d6f997e0ccc0c8463 Merge: afec876951f 63216425d5b Author: Rohit Yadav <[email protected]> AuthorDate: Mon Jul 24 15:57:37 2023 +0530 Merge remote-tracking branch 'origin/4.18' .../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(-) diff --cc ui/src/views/compute/DeployVM.vue index d635d3f8e8c,de74ab8f268..0f63f4e30f0 --- a/ui/src/views/compute/DeployVM.vue +++ b/ui/src/views/compute/DeployVM.vue @@@ -1994,10 -1969,8 +1993,10 @@@ export default deployVmData.dynamicscalingenabled = values.dynamicscalingenabled deployVmData.iothreadsenabled = values.iothreadsenabled deployVmData.iodriverpolicy = values.iodriverpolicy + deployVmData.nicmultiqueuenumber = values.nicmultiqueuenumber + deployVmData.nicpackedvirtqueuesenabled = values.nicpackedvirtqueuesenabled if (values.userdata && values.userdata.length > 0) { - deployVmData.userdata = encodeURIComponent(btoa(sanitizeReverse(values.userdata))) + deployVmData.userdata = this.$toBase64AndURIEncoded(values.userdata) } // step 2: select template/iso if (this.tabKey === 'templateid') {
