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 100bd9de147 do not merge
add 8b281284a26 ui: Fix non admin logouts (#8065)
add 7b4cf1b1c68 ui: update vm deploy form iso label (#8075)
add 8350ce5aa40 storage: allow VM snapshots without memory for KVM when
global setting allows (#8062)
add 8a34afa8ab8 Merge remote-tracking branch 'origin/4.18'
add dccd37af505 Run ResourceCountCheckTask only in the longest running
management server (#7977)
add fb3a2ecb57e Fix NPE if global setting implicit.host.tags is set to
null (#8066)
add 3e7f21a1909 vm-import: fix stopped managed vms listing in unmanaged
instances (#7606)
add 9df580cef45 Merge remote-tracking branch 'apache/4.18' into main
add 0d78b98fd58 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 (100bd9de147)
\
N -- N -- N refs/heads/dummy (0d78b98fd58)
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:
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 2 +-
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 12 +-
.../vmsnapshot/StorageVMSnapshotStrategy.java | 18 ---
.../cloud/cluster/dao/ManagementServerHostDao.java | 2 +
.../cluster/dao/ManagementServerHostDaoImpl.java | 12 ++
.../java/com/cloud/api/query/QueryManagerImpl.java | 12 +-
.../java/com/cloud/deploy/FirstFitPlanner.java | 12 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 37 ++++++-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 122 ++++++++++-----------
ui/public/locales/en.json | 1 +
.../views/compute/wizard/TemplateIsoSelection.vue | 6 +-
ui/src/views/dashboard/UsageDashboard.vue | 2 +-
12 files changed, 139 insertions(+), 99 deletions(-)
