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

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


    omit 997fcca8ff8 do not merge
     add e437d1016f6 Snapshot removal and storage cleanup logs (#8031)
     add ba24a18f27d kvm: fix direct download template size (#8093)
     add 065abe2a3b6 test,refactor: fix test_project_resources cleanup (#8097)
     add c9d230369a7 Merge release branch 4.18 to main
     add 4a86a0d2339 linstor: Fix template volume missing on copy node (#8082)
     add be039a1e46e Merge remote-tracking branch 'apache/4.18' into main
     add 91a570e4619 Refactoring swift util test (#8099)
     add e35fdff7678 ui: add action to delete traffic type (#8076)
     add 01b3056529d do not merge

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   (997fcca8ff8)
            \
             N -- N -- N   refs/heads/dummy (01b3056529d)

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:
 .../download/HttpsDirectTemplateDownloader.java    | 52 +++++++-------
 .../storage/snapshot/SnapshotServiceImpl.java      | 14 ++--
 .../kvm/storage/LinstorStorageAdaptor.java         | 19 ++++-
 .../java/com/cloud/storage/StorageManagerImpl.java | 77 +++++++++++++++------
 .../component/test_project_resources.py            | 80 +++++++++-------------
 ui/public/locales/en.json                          |  4 ++
 ui/src/views/infra/network/TrafficTypesTab.vue     | 63 ++++++++++++++---
 utils/src/main/java/com/cloud/utils/UriUtils.java  |  8 ++-
 .../java/com/cloud/utils/storage/QCOW2Utils.java   |  3 +-
 .../utils/imagestore/ImageStoreUtil.java           |  2 +-
 .../test/java/com/cloud/utils/SwiftUtilTest.java   | 72 +++++--------------
 .../test/java/com/cloud/utils/UriUtilsTest.java    | 14 +++-
 12 files changed, 237 insertions(+), 171 deletions(-)

Reply via email to