This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch healthcheck-4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard 926b7709c13 4.20 Health Check, please don't merge this!
add 3850445b505 ui: fix delete traffic type (#11337)
add 6589235b718 Merge branch '4.19' into 4.20
add ed0d606e983 Find system VM templates for CKS clusters and SharedFS
honouring the preferred architecture (#10946)
add 5ba9af7c939 4.20 Health Check, please don't merge this!
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 (926b7709c13)
\
N -- N -- N refs/heads/healthcheck-4.20 (5ba9af7c939)
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/storage/dao/VMTemplateDao.java | 2 +-
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 11 ++++++-
.../cloud/storage/dao/VMTemplateDaoImplTest.java | 21 ++++++++++++
.../cluster/KubernetesClusterManagerImpl.java | 38 ++++++++++++++++++++--
.../KubernetesClusterActionWorker.java | 4 ++-
...ernetesClusterResourceModifierActionWorker.java | 2 +-
.../cluster/KubernetesClusterManagerImplTest.java | 19 +++++++++++
.../lifecycle/StorageVmSharedFSLifeCycle.java | 3 +-
.../lifecycle/StorageVmSharedFSLifeCycleTest.java | 3 +-
ui/src/views/infra/network/TrafficTypesTab.vue | 2 +-
10 files changed, 94 insertions(+), 11 deletions(-)
