You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2021/12/10 16:51:56 UTC
[cloudstack] 01/01: Merge remote-tracking branch 'apache/4.16'
This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 51d4e5475f3a461b7f1aef39aded5e09773759dd
Merge: 9363f64 8bc69e9
Author: Wei Zhou <we...@apache.org>
AuthorDate: Fri Dec 10 17:50:25 2021 +0100
Merge remote-tracking branch 'apache/4.16'
.../vmware/manager/VmwareStorageManagerImpl.java | 11 ++++-----
.../hypervisor/vmware/resource/VmwareResource.java | 6 ++---
.../main/java/com/cloud/api/ApiResponseHelper.java | 4 ++--
ui/src/config/section/network.js | 17 ++++++++++++--
ui/src/role/index.js | 26 ++++++++++++++++++++++
ui/src/views/compute/KubernetesServiceTab.vue | 9 ++------
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 2 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 16 ++++++-------
ui/src/views/network/CreateL2NetworkForm.vue | 16 ++++++-------
ui/src/views/network/CreateNetwork.vue | 9 ++++----
ui/src/views/network/CreateSharedNetworkForm.vue | 6 -----
ui/src/views/network/UpdateNetwork.vue | 7 +++---
ui/src/views/offering/AddComputeOffering.vue | 9 ++++----
ui/src/views/offering/AddDiskOffering.vue | 7 +++---
ui/src/views/offering/AddNetworkOffering.vue | 3 ++-
ui/src/views/offering/AddVpcOffering.vue | 3 ++-
ui/src/views/offering/UpdateOfferingAccess.vue | 7 +++---
17 files changed, 95 insertions(+), 63 deletions(-)