This is an automated email from the ASF dual-hosted git repository.
weizhouapache pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 2b4bc917293 4.21/main Health Check, please don't merge this!
add e1521f139b0 systemvmtemplate-register: correctly update existing
template name in config (#12703)
add 5893ba5a8c0 server: Fix NPE when on findHostsForMigration when no
suitable hosts are found (#13138)
add 94d911be9ae Translation of missing labels to Portuguese (#12947)
add 522283bdeca Refactor merge conflict checker workflow (#13183)
add 68221cf1018 fix(linstor): pre-flight check destination is a LINSTOR
satellite before live migration (#13077)
add 38c001296a2 Rename gpordeus collaborator to gp-santos (#13195)
add 3c1f03144fe Add null check for ApiKeyPair in getUserByApiKey (#12938)
add c89baae5a4a 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 (2b4bc917293)
\
N -- N -- N refs/heads/healthcheck-main (c89baae5a4a)
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:
.asf.yaml | 2 +-
.github/workflows/merge-conflict-checker.yml | 12 +-
.../api/command/admin/user/GetUserCmd.java | 4 +-
.../upgrade/SystemVmTemplateRegistration.java | 2 +-
.../upgrade/SystemVmTemplateRegistrationTest.java | 14 +-
.../storage/motion/LinstorDataMotionStrategy.java | 61 +
.../com/cloud/server/ManagementServerImpl.java | 13 +-
.../java/com/cloud/user/AccountManagerImpl.java | 5 +
.../com/cloud/server/ManagementServerImplTest.java | 39 +-
ui/public/locales/pt_BR.json | 1254 +++++++++++++++++++-
10 files changed, 1358 insertions(+), 48 deletions(-)
