This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 270fc19 Merge remote-tracking branch 'apache/4.15'
add 2eae0f5 SystemVM: Set agent state to disconnected on Stopping the
systemVM (#5010)
add 5f734f7 vmware: Disk controller vmware deploy as is (#5006)
add 5cbc1d9 Fixed invalid ostypeid when not using deployasis (#5033)
add c6ba3d1 ui: Make 'ACL' field as mandatory and add warning message for
default_allow and default_deny (#5003)
add d47e273 server: Prevent NPE if hypervisor's capabilities are null
(#5029)
new 4b7fa4e Merge remote-tracking branch 'apache/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:
api/src/main/java/com/cloud/host/Status.java | 3 ++
api/src/main/java/com/cloud/vm/VirtualMachine.java | 3 ++
.../template/GetUploadParamsForTemplateCmd.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 9 +++++
.../hypervisor/vmware/resource/VmwareResource.java | 46 ++--------------------
.../main/java/com/cloud/api/ApiResponseHelper.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 7 ++++
ui/public/locales/en.json | 2 +
ui/src/components/view/DetailSettings.vue | 11 ++++--
ui/src/views/network/VpcTab.vue | 2 +-
ui/src/views/network/VpcTiersTab.vue | 26 ++++++++----
11 files changed, 57 insertions(+), 56 deletions(-)
