[cloudstack] branch main updated (1d3083d -> 04738d7)

[nv...@apache.org]

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

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


    from 1d3083d  Added support for removing unused port groups on VMWare (#4701)
     add 4acedc8  Fix failure to scp diagnostic data file from SSVM on ubuntu based env (#5384)
     add 41f6f0e  server: allow destroy/recover volumes which are attached to removed vms (#5364)
     new 04738d7  Merge branch '4.15' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java      | 3 ++-
 .../org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

[cloudstack] 01/01: Merge branch '4.15' into main

[nv...@apache.org]

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

nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 04738d7775fac382250932f44c7e2cb44a54617c
Merge: 1d3083d 41f6f0e
Author: nicolas <ni...@gmail.com>
AuthorDate: Sat Aug 28 09:14:39 2021 -0300

    Merge branch '4.15' into main

 server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java      | 3 ++-
 .../org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)