You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/11/18 08:36:29 UTC
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.16' into main
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 d8004871e528592db9289aee74ba5e8bbceab358
Merge: b4aabad babf94f
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Thu Nov 18 14:05:53 2021 +0530
Merge remote-tracking branch 'origin/4.16' into main
api/src/main/java/com/cloud/vm/NicProfile.java | 2 +-
.../engine/orchestration/NetworkOrchestrator.java | 4 +--
.../java/com/cloud/network/Ipv6AddressManager.java | 2 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 15 +++++++++-
.../com/cloud/network/Ipv6AddressManagerTest.java | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
ui/src/components/view/ResourceLimitTab.vue | 2 +-
ui/src/components/view/SearchView.vue | 2 +-
ui/src/views/AutogenView.vue | 6 ++--
ui/src/views/auth/Login.vue | 6 ++--
ui/src/views/compute/AttachIso.vue | 2 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 7 ++++-
ui/src/views/compute/CreateSSHKeyPair.vue | 2 +-
ui/src/views/compute/CreateSnapshotWizard.vue | 2 +-
ui/src/views/compute/DeployVM.vue | 7 ++++-
ui/src/views/compute/DestroyVM.vue | 2 +-
ui/src/views/compute/EditVM.vue | 2 +-
ui/src/views/compute/InstanceTab.vue | 2 +-
ui/src/views/compute/MigrateVMStorage.vue | 2 +-
ui/src/views/compute/ScaleKubernetesCluster.vue | 2 +-
ui/src/views/compute/StartVirtualMachine.vue | 2 +-
ui/src/views/compute/UpgradeKubernetesCluster.vue | 2 +-
ui/src/views/compute/backup/FormSchedule.vue | 2 +-
ui/src/views/iam/AddAccount.vue | 7 ++++-
ui/src/views/iam/AddLdapAccount.vue | 2 +-
ui/src/views/iam/AddUser.vue | 2 +-
ui/src/views/iam/ChangeUserPassword.vue | 2 +-
ui/src/views/iam/ConfigureSamlSsoAuth.vue | 2 +-
ui/src/views/iam/CreateRole.vue | 2 +-
ui/src/views/iam/DomainActionForm.vue | 2 +-
ui/src/views/iam/EditUser.vue | 2 +-
ui/src/views/iam/ImportRole.vue | 2 +-
.../views/image/AddKubernetesSupportedVersion.vue | 2 +-
ui/src/views/image/IsoZones.vue | 2 +-
ui/src/views/image/RegisterOrUploadIso.vue | 7 ++++-
ui/src/views/image/RegisterOrUploadTemplate.vue | 2 +-
ui/src/views/image/TemplateZones.vue | 2 +-
.../image/UpdateKubernetesSupportedVersion.vue | 2 +-
ui/src/views/infra/AddPrimaryStorage.vue | 34 ++++++++++++----------
ui/src/views/infra/AddSecondaryStorage.vue | 2 +-
ui/src/views/infra/InfraSummary.vue | 4 +--
ui/src/views/infra/MigrateData.vue | 2 +-
ui/src/views/infra/PodAdd.vue | 2 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 2 +-
ui/src/views/infra/network/EditTrafficLabel.vue | 2 +-
.../views/infra/network/IpRangesTabManagement.vue | 2 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 2 +-
ui/src/views/infra/network/IpRangesTabStorage.vue | 2 +-
ui/src/views/infra/network/ServiceProvidersTab.vue | 2 +-
.../infra/network/providers/AddF5LoadBalancer.vue | 2 +-
.../network/providers/AddNetscalerLoadBalancer.vue | 2 +-
.../infra/network/providers/AddNiciraNvpDevice.vue | 2 +-
.../network/providers/AddPaloAltoFirewall.vue | 2 +-
.../infra/network/providers/AddSrxFirewall.vue | 2 +-
ui/src/views/infra/routers/RouterHealthCheck.vue | 2 +-
.../views/infra/zone/AdvancedGuestTrafficForm.vue | 2 +-
ui/src/views/infra/zone/IpAddressRangeForm.vue | 2 +-
ui/src/views/infra/zone/StaticInputsForm.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 1 +
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 2 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue | 2 +-
ui/src/views/network/AclListRulesTab.vue | 6 ++--
ui/src/views/network/CreateIsolatedNetworkForm.vue | 7 ++++-
ui/src/views/network/CreateL2NetworkForm.vue | 2 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 7 ++++-
ui/src/views/network/CreateVlanIpRange.vue | 2 +-
ui/src/views/network/CreateVpc.vue | 2 +-
ui/src/views/network/CreateVpnCustomerGateway.vue | 7 ++++-
ui/src/views/network/FirewallRules.vue | 2 +-
.../views/network/IngressEgressRuleConfigure.vue | 2 +-
ui/src/views/network/LoadBalancing.vue | 4 +--
ui/src/views/network/PortForwarding.vue | 2 +-
ui/src/views/network/StaticRoutesTab.vue | 2 +-
ui/src/views/network/VpcTab.vue | 6 ++--
ui/src/views/network/VpcTiersTab.vue | 4 +--
ui/src/views/offering/AddComputeOffering.vue | 2 +-
ui/src/views/offering/AddDiskOffering.vue | 7 ++++-
ui/src/views/offering/AddNetworkOffering.vue | 7 ++++-
ui/src/views/offering/AddVpcOffering.vue | 2 +-
ui/src/views/offering/ImportBackupOffering.vue | 2 +-
ui/src/views/offering/UpdateOfferingAccess.vue | 2 +-
.../views/plugins/quota/EditTariffValueWizard.vue | 2 +-
ui/src/views/project/AddAccountOrUserToProject.vue | 4 +--
ui/src/views/project/InvitationTokenTemplate.vue | 2 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 4 +--
ui/src/views/storage/AttachVolume.vue | 2 +-
.../views/storage/CreateSnapshotFromVMSnapshot.vue | 2 +-
ui/src/views/storage/CreateVolume.vue | 2 +-
ui/src/views/storage/FormSchedule.vue | 2 +-
ui/src/views/storage/ResizeVolume.vue | 2 +-
ui/src/views/storage/RestoreAttachBackupVolume.vue | 2 +-
ui/src/views/storage/TakeSnapshot.vue | 2 +-
ui/src/views/storage/UploadLocalVolume.vue | 2 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 2 +-
95 files changed, 184 insertions(+), 123 deletions(-)