This is an automated email from the ASF dual-hosted git repository. DaanHoogland pushed a commit to branch 4.22 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit ce52b9dae0cef57394967346247914a47cb04da4 Merge: f6cad87586f 61afb4cb782 Author: Abhisar Sinha <[email protected]> AuthorDate: Tue Mar 17 07:22:45 2026 +0530 Merge branch '4.20' into 20.3.0-sec .github/workflows/merge-conflict-checker.yml | 4 +- .../apache/cloudstack/api/ApiServerService.java | 2 + .../cloud/agent/api/ModifyStoragePoolAnswer.java | 4 + .../src/main/java/com/cloud/user/UserVO.java | 2 +- .../main/java/com/cloud/user/dao/AccountDao.java | 2 - .../java/com/cloud/user/dao/AccountDaoImpl.java | 60 +-------- .../CitrixModifyStoragePoolCommandWrapper.java | 12 +- .../api/command/OauthLoginAPIAuthenticatorCmd.java | 8 +- .../command/OauthLoginAPIAuthenticatorCmdTest.java | 19 +++ server/src/main/java/com/cloud/api/ApiServer.java | 20 +++ .../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 9 +- .../com/cloud/server/ManagementServerImpl.java | 33 +++-- .../com/cloud/template/TemplateManagerImpl.java | 14 ++- .../java/com/cloud/user/AccountManagerImpl.java | 134 ++++++++++----------- ...tBase.java => AccountManagentImplTestBase.java} | 8 +- .../com/cloud/user/AccountManagerImplTest.java | 112 ++++++++--------- .../AccountManagerImplVolumeDeleteEventTest.java | 2 +- ui/src/config/section/user.js | 4 + 18 files changed, 219 insertions(+), 230 deletions(-)
