This is an automated email from the ASF dual-hosted git repository. shwstppr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 25cb5453259a6197003ffae44e018bc051e93654 Merge: 66665b883c1 276eb8111da Author: Abhishek Kumar <[email protected]> AuthorDate: Wed Jan 28 11:33:03 2026 +0530 Merge remote-tracking branch 'apache/4.22' .../consoleproxy/ConsoleProxyResource.java | 2 +- .../storage/motion/AncientDataMotionStrategy.java | 13 ++++++++- .../networkservice/BaremetalDnsmasqResource.java | 4 +-- .../BaremetalKickStartPxeResource.java | 6 ++-- .../networkservice/BaremetalPingPxeResource.java | 10 +++---- .../cluster/KubernetesClusterManagerImpl.java | 2 +- .../java/com/cloud/api/query/QueryManagerImpl.java | 1 + .../network/element/VpcVirtualRouterElement.java | 10 ++++++- .../cloud/network/vpc/NetworkACLServiceImpl.java | 15 ++++++++-- .../storage/heuristics/HeuristicRuleHelper.java | 16 +++++----- .../rdpconsole/src/main/java/common/Client.java | 34 +++++++++++++--------- ui/public/locales/en.json | 1 + ui/src/components/view/ListView.vue | 10 +------ ui/src/utils/plugins.js | 11 +++++++ ui/src/views/setting/ConfigurationValue.vue | 20 ++----------- utils/src/main/java/com/cloud/utils/UriUtils.java | 8 +++-- 16 files changed, 95 insertions(+), 68 deletions(-)
