This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 1e859a0 Merge remote-tracking branch 'origin/4.15'
add 73f82ae ui: Save the tab and re-activate it after submitting the
form. (#4962)
add 98e2ed3 vmware: Add force parameter to iso attach/detach operations
(#4907)
add 39cb2bf ui: Display 'Add LDAP Account' button when LDAP configuration
is added (#4971)
add be255e4 server: protect against stray snapshot-details without
snapshot (#4924)
add de30f3b vmware cks: Guard k8s cluster root disk resize if no root
disk size passed (#4957)
new 4742ac1 Merge remote-tracking branch 'origin/4.15'
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:
.../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(-)
