This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch healthcheck-4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard da318d75afd 4.22 Health Check, please don't merge this!
add 454bba0f3e5 server: report distinct read/write volume throttle rates
(#14048)
add 56306ab52cc Merge remote-tracking branch 'apache/4.20' into 4.22
add 2ebcaf626cb Do not shut down networks that are being implemented in
the orphaned-network cleanup (#14527)
add d02adcde900 Merge branch '4.20' into 4.22
add 897b94140e2 4.22 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 (da318d75afd)
\
N -- N -- N refs/heads/healthcheck-4.22 (897b94140e2)
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:
.../main/java/com/cloud/utils/db/Merovingian2.java | 10 ++
.../cloud/utils/db/Merovingian2AcquireTest.java | 82 ++++++++++++++
.../framework/jobs/impl/AsyncJobManagerImpl.java | 66 +++++++----
.../jobs/impl/AsyncJobManagerImplTest.java | 125 +++++++++++++++++++++
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 12 +-
.../cloud/api/query/dao/VolumeJoinDaoImplTest.java | 19 ++++
6 files changed, 289 insertions(+), 25 deletions(-)
create mode 100644
framework/db/src/test/java/com/cloud/utils/db/Merovingian2AcquireTest.java
