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 bbbd8f7f48d do not merge
add f62b6340334 ui: correctly show volume physical size (#8119)
add a2ec1f37778 marvin,test: fix directdownload template checksum test
(#8096)
add e199678101e ui: fix bulk delete template from zones (#8118)
add 1bb6130795c Merge remote-tracking branch 'apache/4.18' into main
add d3d3027ba63 Fix ISOs and templates listing pagination (#7974)
add f99eebfa3c4 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 (bbbd8f7f48d)
\
N -- N -- N refs/heads/dummy (f99eebfa3c4)
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:
.../java/com/cloud/api/query/QueryManagerImpl.java | 70 +++++++++++++-----
.../com/cloud/api/query/dao/TemplateJoinDao.java | 2 +
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 13 ++++
.../com/cloud/api/query/QueryManagerImplTest.java | 83 ++++++++++++++++++++++
test/integration/smoke/test_templates.py | 32 +++++----
tools/marvin/marvin/lib/base.py | 2 +
ui/src/components/view/ListView.vue | 2 +-
ui/src/config/section/storage.js | 6 +-
ui/src/views/image/TemplateZones.vue | 2 +-
9 files changed, 172 insertions(+), 40 deletions(-)
