This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 711d4b9f0f Merge remote-tracking branch 'origin/4.17'
add e467ad02ce Fix VMware memory retrieval (#6414)
add 8a229baac5 clear all filter values after the reset button clicked
(#6503)
add 7d23a0a759 Fix spelling (#6272)
new a470f3353a Merge branch '4.17'
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:
agent/src/main/java/com/cloud/agent/Agent.java | 6 +++---
agent/src/main/java/com/cloud/agent/AgentShell.java | 2 +-
.../main/java/com/cloud/agent/api/storage/OVFHelper.java | 2 +-
.../com/cloud/network/lb/LoadBalancingRulesService.java | 4 ++--
api/src/main/java/com/cloud/storage/Volume.java | 2 +-
api/src/main/java/com/cloud/vm/UserVmService.java | 2 +-
.../api/command/admin/address/ReleasePodIpCmdByAdmin.java | 2 +-
.../admin/network/CreateStorageNetworkIpRangeCmd.java | 2 +-
.../api/command/user/account/AddUserToProjectCmd.java | 2 +-
.../api/command/user/job/QueryAsyncJobResultCmd.java | 2 +-
.../ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java | 2 +-
.../command/user/securitygroup/DeleteSecurityGroupCmd.java | 2 +-
.../cloudstack/api/command/user/vm/RestoreVMCmd.java | 2 +-
.../api/response/LBStickinessPolicyResponse.java | 2 +-
.../cloud/agent/api/routing/SetFirewallRulesCommand.java | 2 +-
.../com/cloud/agent/api/routing/SetNetworkACLCommand.java | 2 +-
.../main/java/com/cloud/upgrade/dao/Upgrade410to420.java | 2 +-
.../main/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py | 14 +++++++-------
.../hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java | 2 +-
.../cloud/hypervisor/vmware/resource/VmwareResource.java | 7 +++++--
.../main/java/com/cloud/network/element/OvsElement.java | 2 +-
.../storage/datastore/client/ScaleIOGatewayClientImpl.java | 2 +-
.../org/apache/cloudstack/ldap/LdapManagerImplSpec.groovy | 4 ++--
.../apache/cloudstack/ldap/LdapSearchUserCmdSpec.groovy | 2 +-
.../com/cloud/deploy/DeploymentPlanningManagerImpl.java | 2 +-
server/src/main/java/com/cloud/event/ActionEventUtils.java | 2 +-
.../java/com/cloud/network/as/AutoScaleManagerImpl.java | 2 +-
.../com/cloud/resource/RollingMaintenanceManagerImpl.java | 10 +++++-----
.../region/gslb/GlobalLoadBalancingRulesServiceImpl.java | 4 ++--
.../src/test/java/com/cloud/vpc/NetworkACLManagerTest.java | 2 +-
.../src/main/java/vncclient/vnc/Vnc33Authentication.java | 2 +-
.../maint/test_redundant_router_deployment_planning.py | 6 +++---
.../component/maint/testpath_disablestoragepool.py | 2 +-
.../integration/component/maint/testpath_vMotion_vmware.py | 14 +++++++-------
test/integration/component/test_add_remove_network.py | 2 +-
test/integration/component/test_egress_fw_rules.py | 10 +++++-----
test/integration/component/test_egress_rules.py | 2 +-
.../component/test_migrate_vol_to_maintained_pool.py | 4 ++--
test/integration/component/test_netscaler_configs.py | 2 +-
test/integration/component/test_netscaler_lb.py | 8 ++++----
test/integration/component/test_netscaler_nw_off.py | 6 +++---
test/integration/component/test_stopped_vm.py | 2 +-
test/integration/component/test_vpc_routers.py | 4 ++--
.../integration/smoke/test_reset_configuration_settings.py | 6 +++---
test/integration/testpaths/testpath_multiple_snapshot.py | 2 +-
test/integration/testpaths/testpath_restore_vm.py | 2 +-
test/integration/testpaths/testpath_snapshot_hadrning.py | 4 ++--
.../java/com/cloud/test/stress/StressTestDirectAttach.java | 2 +-
.../main/java/com/cloud/test/stress/TestClientWithAPI.java | 2 +-
tools/devcloud4/README.md | 2 +-
tools/ngui/precache.py | 2 +-
ui/src/components/view/SearchView.vue | 2 ++
52 files changed, 94 insertions(+), 89 deletions(-)
