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/12/03 10:12:29 UTC
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.16'

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 2e9c9417be150384db6f503dff90dbbfeeeae09e
Merge: 895f282 a277e4e
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Dec 3 15:41:56 2021 +0530

    Merge remote-tracking branch 'origin/4.16'

 .../org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java |  3 +--
 .../api/command/admin/address/ReleasePodIpCmdByAdmin.java     |  3 +--
 .../cloudstack/api/command/admin/cluster/ListClustersCmd.java |  3 +--
 .../command/admin/router/ListVirtualRouterElementsCmd.java    |  3 +--
 .../command/admin/storage/CreateSecondaryStagingStoreCmd.java |  2 +-
 .../api/command/admin/systemvm/ScaleSystemVMCmd.java          |  3 +--
 .../api/command/admin/systemvm/UpgradeSystemVMCmd.java        |  3 +--
 .../api/command/admin/usage/ListTrafficMonitorsCmd.java       |  3 +--
 .../cloudstack/api/command/admin/user/GetUserKeysCmd.java     |  2 +-
 .../apache/cloudstack/api/command/admin/user/MoveUserCmd.java |  2 +-
 .../command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java  |  2 +-
 .../api/command/user/account/DeleteAccountFromProjectCmd.java |  3 +--
 .../api/command/user/account/DeleteUserFromProjectCmd.java    |  3 +--
 .../api/command/user/guest/ListGuestOsCategoriesCmd.java      |  3 +--
 .../cloudstack/api/command/user/guest/ListGuestOsCmd.java     |  3 +--
 .../api/command/user/loadbalancer/ListSslCertsCmd.java        |  2 +-
 .../cloudstack/api/command/user/nat/DisableStaticNatCmd.java  |  3 +--
 .../cloudstack/api/command/user/nat/EnableStaticNatCmd.java   |  2 +-
 .../cloudstack/api/command/user/network/DeleteNetworkCmd.java |  3 +--
 .../user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java  |  2 +-
 .../api/command/user/resource/ListHypervisorsCmd.java         |  3 +--
 .../user/securitygroup/AuthorizeSecurityGroupEgressCmd.java   |  2 +-
 .../api/command/user/snapshot/ArchiveSnapshotCmd.java         |  2 +-
 .../cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java  |  2 +-
 .../cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java      |  2 +-
 .../main/java/com/cloud/usage/dao/UsageNetworkDaoImpl.java    |  2 +-
 .../hypervisor/vmware/manager/VmwareStorageManagerImpl.java   |  3 +--
 .../user/kubernetes/cluster/ScaleKubernetesClusterCmd.java    |  2 +-
 .../java/com/cloud/api/commands/ListExternalFirewallsCmd.java |  3 +--
 .../cloud/api/commands/DeleteNetscalerControlCenterCmd.java   |  2 +-
 .../java/org/apache/cloudstack/api/commands/DeleteSspCmd.java |  2 +-
 server/src/main/java/com/cloud/api/ApiServlet.java            |  2 +-
 .../com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java  |  2 +-
 .../src/main/java/com/cloud/network/NetworkServiceImpl.java   |  4 ++--
 .../src/main/java/com/cloud/resource/ResourceManagerImpl.java |  2 +-
 .../main/java/com/cloud/storage/download/DownloadState.java   |  2 +-
 .../src/main/java/com/cloud/storage/upload/UploadState.java   |  2 +-
 .../java/com/cloud/test/stress/StressTestDirectAttach.java    |  2 +-
 test/src-not-used/main/java/com/cloud/test/utils/SignEC2.java |  2 +-
 ui/src/config/section/infra/hosts.js                          |  2 +-
 ui/src/views/compute/DeployVM.vue                             |  6 +++---
 ui/src/views/compute/InstanceTab.vue                          | 11 +++++++----
 42 files changed, 51 insertions(+), 64 deletions(-)