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


 discard 01b3056529d do not merge
     add 76ab621a5a3 Fix UUID for child datastores in all cases (#8057)
     add 8eaf2648b64 Merge release branch 4.18 to main
     add 9834d5168fd pre-commit: standardize more line endings to `lf` (#7804)
     add 0183e252794 Fix VM snapshot size during storage capacity check (#8101)
     add 540c7b802f4 test: add test for standalone snapshot (#8104)
     add 20046ffe61d Merge remote-tracking branch 'apache/4.18' into main
     add 67cb9b9e40b linstor: fix template copy on non hyperconverged setups 
(#8114)
     add fcbf540369d Merge remote-tracking branch 'apache/4.18' into main
     add bbbd8f7f48d 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   (01b3056529d)
            \
             N -- N -- N   refs/heads/dummy (bbbd8f7f48d)

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:
 .pre-commit-config.yaml                            |    2 +-
 .../java/com/cloud/storage/dao/VolumeDaoImpl.java  |    2 -
 .../main/resources/META-INF/db/schema-302to303.sql |  392 +++----
 .../main/resources/META-INF/db/schema-304to305.sql |  778 ++++++-------
 engine/service/src/main/webapp/index.jsp           |   46 +-
 .../DotNet/ServerResource/.nuget/NuGet.Config      |   10 +-
 .../DotNet/ServerResource/.nuget/NuGet.targets     |  226 ++--
 .../HypervResource/HypervResource.csproj           |  206 ++--
 .../ServerResource.Tests.csproj                    |  256 ++---
 .../ServerResource/WmiWrappers/WmiWrappers.csproj  |  372 +++---
 .../hypervisor/vmware/resource/VmwareResource.java |    2 +-
 .../kvm/storage/LinstorStorageAdaptor.java         |    2 +-
 server/src/test/resources/db.properties            |  144 +--
 test/integration/smoke/test_snapshots.py           |  156 +++
 test/metadata/func/commands                        |  382 +++----
 test/metadata/func/error_events.properties         |   64 +-
 test/metadata/func/regression_events.properties    |   86 +-
 tools/eclipse/eclipse.epf                          | 1184 ++++++++++----------
 18 files changed, 2232 insertions(+), 2078 deletions(-)

Reply via email to