This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 0ec04b92d9d 4.21/main Health Check, please don't merge this!
add 17ec4fc31c4 UI: Fix duplicate quickview (for provider column) in
backup repository (#11849)
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)
add b74f21b9670 Merge branch '4.20' into 4.22
add a8bd02f8ba8 Merge branch '4.22'
add da85858e93e unit test fix (after merge)
add f9dc0218657 4.21/main Health Check, please don't merge this!
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (0ec04b92d9d)
\
N -- N -- N refs/heads/healthcheck-main (f9dc0218657)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
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 | 114 ++++++++----------
.../AccountManagerImplVolumeDeleteEventTest.java | 2 +-
ui/src/components/view/ListView.vue | 36 +++---
ui/src/config/section/user.js | 4 +
14 files changed, 188 insertions(+), 239 deletions(-)
rename server/src/test/java/com/cloud/user/{AccountManagetImplTestBase.java =>
AccountManagentImplTestBase.java} (98%)
