This is an automated email from the ASF dual-hosted git repository.

dahn pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    omit df24bcffcff Merge branch 'main' into healthcheck-main
    omit 65adf9ba180 Merge branch 'main' into healthcheck-main
    omit 8841737b83a Merge branch 'main' into healthcheck-main
    omit 57e54ce859c Merge branch 'main' into healthcheck-main
    omit cb24461c39e DO NOT MERGE
    omit e5bd83ea6a3 Merge branch '4.19'
    omit 8d819ec5811 Merge branch '4.18' into 4.19
    omit 05a44d86465 Merge tag '4.19.1.2' into 4.19
    omit 1af41585b75 Merge tag '4.18.2.4' into 4.18
    omit 8925ac72018 Fix Listing backup schedules (#9749)
    omit 9c86c4da968 Filter list VMs by IP address (#9547)
    omit d6181d54210 Fix `updateTemplatePermission` when the UI is set to a 
language other than English (#9766)
    omit 18fe4226cec Updating pom.xml version numbers for release 4.19.1.2
    omit b3f9824be1e Fix Vue devServer after CSRF fix
    omit 13dd6983428 util: check JSESSIONID in cookies if user is passed
    omit 4fa22f4d588 Validate QCOW2 on upload and register
    omit 123b426c16c fix quota resource access validation
    omit 8a2f6528f1e Session Token Invalidation on Logout
    omit 54b3519df12 Updating pom.xml version numbers for release 4.18.2.4
    omit 8830d3aea16 Fix Vue devServer after CSRF fix
    omit 124d6b8b816 util: check JSESSIONID in cookies if user is passed
    omit 1861e78361e Validate QCOW2 on upload and register
    omit b97bd3bee14 fix quota resource access validation
    omit 24d12f13277 Session Token Invalidation on Logout
    omit c087de4adfe Merge branch '4.19'
    omit 4ea342cad3d Updating pom.xml version numbers for release 4.19.1.1
    omit 7cfbcf4b4f1 [4.19] server, api, ui: access improvements and assorted 
fixes (#22)
    omit be191f5ad79 Updating pom.xml version numbers for release 4.18.2.3
    omit b458e5b9974 Merge pull request #19 from shapeblue/fix-userkeys-cve
    omit e7dce2bcce5 server, api: account and api entity access improvements
    omit 22baf2494d6 Updating pom.xml version numbers for release 4.18.2.2
    omit f0faa4a6b30 saml: signature check improvements
    omit ef5b5bbd4e5 Updating pom.xml version numbers for release 4.18.2.1
    omit 4f5561937cb framework/cluster: improve cluster service and integration 
API service
     add 019f2c60ceb server: fix vm_stats records are not removed if batchsize 
is 0 (#9818)
     add 930125e3044 4.20/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   (df24bcffcff)
            \
             N -- N -- N   refs/heads/healthcheck-main (930125e3044)

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:
 README.md                                                        | 2 +-
 .../src/main/java/com/cloud/storage/dao/VolumeStatsDaoImpl.java  | 9 +--------
 engine/schema/src/main/java/com/cloud/vm/dao/VmStatsDaoImpl.java | 9 +--------
 framework/db/src/main/java/com/cloud/utils/db/GenericDao.java    | 8 --------
 .../db/src/main/java/com/cloud/utils/db/GenericDaoBase.java      | 7 -------
 server/src/main/java/com/cloud/api/query/QueryManagerImpl.java   | 2 +-
 server/src/test/java/com/cloud/user/MockUsageEventDao.java       | 5 -----
 7 files changed, 4 insertions(+), 38 deletions(-)

Reply via email to