This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 4742ac15f7be5d3cf6f7e328133cb8589a7578ce Merge: 1e859a0 de30f3b Author: Rohit Yadav <[email protected]> AuthorDate: Thu Apr 29 21:50:40 2021 +0530 Merge remote-tracking branch 'origin/4.15' .../com/cloud/template/TemplateApiService.java | 4 +- .../api/command/user/iso/AttachIsoCmd.java | 10 +- .../api/command/user/iso/DetachIsoCmd.java | 14 +- .../cloudstack/storage/command/AttachCommand.java | 9 ++ .../cloudstack/storage/command/DettachCommand.java | 9 ++ .../engine/orchestration/DataMigrationUtility.java | 4 +- .../storage/snapshot/SnapshotDataFactoryImpl.java | 3 + .../storage/snapshot/SnapshotObject.java | 5 +- .../framework/jobs/impl/AsyncJobManagerImpl.java | 4 + .../hypervisor/vmware/resource/VmwareResource.java | 82 ++++++---- .../storage/resource/VmwareStorageProcessor.java | 12 +- .../KubernetesClusterActionWorker.java | 4 +- ...ernetesClusterResourceModifierActionWorker.java | 4 +- .../KubernetesClusterStartWorker.java | 8 +- .../cloud/storage/snapshot/SnapshotManager.java | 3 - .../storage/snapshot/SnapshotManagerImpl.java | 10 -- .../com/cloud/template/TemplateManagerImpl.java | 20 +-- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +- test/integration/smoke/test_scale_vm.py | 2 +- ui/src/components/view/ResourceView.vue | 20 ++- ui/src/config/section/compute.js | 8 +- ui/src/store/modules/user.js | 11 +- ui/src/views/AutogenView.vue | 3 + ui/src/views/compute/AttachIso.vue | 8 + ui/src/views/network/PublicIpResource.vue | 7 +- .../views/plugins/quota/QuotaSummaryResource.vue | 7 +- .../hypervisor/vmware/mo/VirtualMachineMO.java | 171 +++++++++++---------- 27 files changed, 281 insertions(+), 163 deletions(-)
