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 9af335baa5a do not merge
add 0e9a19f24db ui: Fix project theme on reload or refresh (#7893)
add e4117e68d2f engine/schema: fix duplicated guest OSes in 4.18.0.0
(#7799)
add 27f148e79e7 Merge branch '4.18'
add 8cb30551d58 UI: update ip ranges of shared networks (#7896)
add d87f39ad27f ui: make it clear that deletion of a volume will not
delete any snapshots (#7897)
add 594d212a8bc Merge branch '4.18'
add 0e6a3f7a074 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 (9af335baa5a)
\
N -- N -- N refs/heads/dummy (0e6a3f7a074)
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:
api/src/main/java/com/cloud/storage/GuestOS.java | 2 +
.../api/command/admin/guest/AddGuestOsCmd.java | 8 +-
.../api/command/admin/guest/UpdateGuestOsCmd.java | 11 +-
.../api/command/user/guest/ListGuestOsCmd.java | 14 ++-
.../cloudstack/api/response/GuestOSResponse.java | 12 ++
.../src/main/java/com/cloud/storage/GuestOSVO.java | 14 +++
.../java/com/cloud/storage/dao/GuestOSDao.java | 11 +-
.../java/com/cloud/storage/dao/GuestOSDaoImpl.java | 78 ++++++++++++-
.../cloud/storage/dao/GuestOSHypervisorDao.java | 8 +-
.../storage/dao/GuestOSHypervisorDaoImpl.java | 8 +-
.../main/java/com/cloud/upgrade/GuestOsMapper.java | 110 ++++++++++++++++--
.../com/cloud/upgrade/dao/Upgrade41800to41810.java | 12 ++
.../resources/META-INF/db/schema-41720to41800.sql | 2 +
.../resources/META-INF/db/schema-41800to41810.sql | 4 +
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 4 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 1 +
.../com/cloud/server/ManagementServerImpl.java | 61 +++-------
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 2 +-
ui/public/locales/en.json | 2 +-
ui/src/components/header/ProjectMenu.vue | 1 +
ui/src/views/network/CreateVlanIpRange.vue | 4 +-
ui/src/views/network/GuestIpRanges.vue | 129 ++++++++++++++++++---
23 files changed, 409 insertions(+), 91 deletions(-)
