This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 5caf6cd043f Merge branch '4.20' into 4.22
add 87c8e746423 Fix github action workflow (#12675)
add da7ac80dc41 prevent user.uuid from being regenerated on each operation
by reading it from the DB (#12632)
add d0543449a66 Changes to the error message displayed during the removal
of public templates that are used (#12373)
add cf71938473b [UI] Allow change password for native users only. (#12584)
add c748b69e70c Fix NPE during public IP listing when a removed network or
VPC ID is informed for associatenetworkid parameter (#12372)
add 744c8afcf15 fix primary storage maintenance on xcpng (#12694)
new b74f21b9670 Merge branch '4.20' into 4.22
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:
.github/workflows/merge-conflict-checker.yml | 4 +-
.../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 +-
.../com/cloud/server/ManagementServerImpl.java | 31 +++--
.../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 +
13 files changed, 168 insertions(+), 221 deletions(-)
rename server/src/test/java/com/cloud/user/{AccountManagetImplTestBase.java =>
AccountManagentImplTestBase.java} (98%)
