You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pe...@apache.org on 2024/10/10 21:12:26 UTC
(cloudstack) 09/11: Merge branch 'netris-release' into netris-phase2
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch netris-phase2-vpc
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 9b97a2a6f6d9c4cfe6d7aa31fc54a351714988f6
Merge: 915a086e9f4 c087de4adfe
Author: nvazquez <ni...@gmail.com>
AuthorDate: Thu Oct 3 15:54:16 2024 -0300
Merge branch 'netris-release' into netris-phase2
.../main/java/com/cloud/network/NetworkModel.java | 4 +-
client/pom.xml | 21 +---
debian/control | 4 +-
.../upgrade/SystemVmTemplateRegistration.java | 41 ++++++--
.../java/com/cloud/cluster/ClusterManagerImpl.java | 6 +-
.../lifecycle/CloudStackExtendedLifeCycle.java | 22 +++-
.../CloudStackExtendedLifeCycleStart.java | 1 -
.../module/factory/CloudStackSpringContext.java | 4 +-
plugins/hypervisors/kvm/pom.xml | 5 -
.../tungsten/agent/api/SetupTfRouteCommand.java | 64 ++++++++++++
.../agent/api/SetupTungstenVRouterCommand.java | 77 ++++++++++++++
.../api/UpdateTungstenLoadbalancerSslCommand.java | 83 +++++++++++++++
.../UpdateTungstenLoadbalancerStatsCommand.java | 71 +++++++++++++
.../cluster/KubernetesClusterManagerImpl.java | 5 +-
...ernetesClusterResourceModifierActionWorker.java | 2 +-
.../KubernetesClusterStartWorker.java | 5 +-
.../main/resources/conf/k8s-control-node-add.yml | 2 +-
.../src/main/resources/conf/k8s-control-node.yml | 2 +-
.../src/main/resources/conf/k8s-node.yml | 2 +-
.../main/resources/script/upgrade-kubernetes.sh | 2 +-
plugins/network-elements/tungsten/pom.xml | 7 --
plugins/pom.xml | 2 +-
.../datastore/manager/ScaleIOSDCManagerImpl.java | 42 +++++++-
server/pom.xml | 11 --
.../java/com/cloud/network/NetworkModelImpl.java | 13 ++-
.../java/com/cloud/network/NetworkServiceImpl.java | 6 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 2 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 114 ++++++++++++---------
.../com/cloud/server/ManagementServerImpl.java | 4 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 8 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 11 +-
.../diagnostics/DiagnosticsServiceImpl.java | 3 +-
.../resource/ResourceCleanupServiceImpl.java | 4 +-
.../com/cloud/network/MockNetworkModelImpl.java | 4 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 6 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 5 +-
systemvm/debian/opt/cloud/bin/setup/cksnode.sh | 6 ++
test/integration/smoke/test_usage.py | 2 +-
tools/docker/Dockerfile | 3 +-
tools/docker/Dockerfile.marvin | 3 +-
tools/docker/Dockerfile.smokedev | 3 +-
ui/Dockerfile | 2 +-
ui/src/components/header/ProjectMenu.vue | 2 +-
ui/src/config/section/compute.js | 4 +-
ui/src/views/compute/EditVM.vue | 35 +++++--
ui/src/views/iam/DomainActionForm.vue | 5 +
ui/src/views/network/VpcTab.vue | 8 +-
47 files changed, 570 insertions(+), 168 deletions(-)