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

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


    omit bd6d8d5  system_use column is now moved from disk_offering table to 
service_offering table, because it is applicable only to service offering.
     add b1bb22d  ui: Pass rootdisksize only if template is not deployasis 
(#5995)
     add e0a5df5  CKS Enhancements and SystemVM template upgrade improvements 
(#5863)
     add b50542a  Merge branch '4.16' into main
     add d4f40ec  Fixed strings import issue (#5998)
     add 59dda5b1 Added a log line to HttpUploadServerHandler (#5983)
     add ee947e1  [marvin, VMware] Fix repeated test failures observed on 
'main' branch (#5992)
     add ed30683  [Simulator] Add zone wide storage (#5986)
     add d82cd55  Respect VM UEFI details on first boot (#5990)
     add 478e244  Block remove of VM which has backup offering (#5457)
     add c543f5f  server: reapply checkVmProfileAndHost to check guest os 
preference (#6000)
     add 545f859  Merge branch '4.16' into main
     add ac794a0  ui: minor change with help text on dashboard (#6003)
     add f74e87f  Merge branch '4.16'
     add f96f6fa  Improve messages on adding hosts errors (#5988)
     add 550c810  [VMware] Support for removal of NIC on IP disassociation on 
the VR (#5985)
     add 9eefc76  UI: Filter menu UX improvements (#5994)
     add 72a77d5  UI: Fix issue while listing projects in the Project Menu - 
DashBoard (#6006)
     add d311f88  Allow scaling VM to a service offering having different 
storage tags (#5996)
     add 5095543  [Veeam] Change the VM assign flow logic in a Backup Offering 
(#5903)
     add e662535  UI: Fix move VM out of a project (#6010)
     add b8ce074  UI: fix network list when assign vm to other accounts in 
project view (#6009)
     add 5d1e54a  server: fix host anti-affinity when start batch vms (#6002)
     add e7082d9  Fix Usage event when a volume in allocated state is deleted 
(#5901)
     add 74a15a5  system_use column is now moved from disk_offering table to 
service_offering table, because it is applicable only to service offering.

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   (bd6d8d5)
            \
             N -- N -- N   refs/heads/FixUserListingDiskOffering (74a15a5)

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:
 .gitignore                                         |   1 +
 .../src/main/java/com/cloud/agent/AgentShell.java  |  50 ++++----
 .../main/java/com/cloud/vm/VmDetailConstants.java  |   1 +
 .../api/command/user/vm/DeployVMCmd.java           |   2 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   9 +-
 engine/schema/pom.xml                              |   8 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   9 +-
 .../upgrade/SystemVmTemplateRegistration.java      |  81 ++++++------
 .../resources/META-INF/db/schema-41600to41610.sql  |  23 ++++
 engine/schema/templateConfig.sh                    |  20 +--
 .../affinity/HostAntiAffinityProcessor.java        |   3 +-
 .../hypervisor/vmware/resource/VmwareResource.java | 138 ++++++++++++++-------
 .../cluster/KubernetesClusterManagerImpl.java      | 120 ++++++++----------
 .../KubernetesClusterActionWorker.java             | 101 ++++++++++-----
 ...ernetesClusterResourceModifierActionWorker.java | 122 +++++++++---------
 .../KubernetesClusterScaleWorker.java              |   8 +-
 .../KubernetesClusterStartWorker.java              |  57 +++++----
 .../KubernetesClusterUpgradeWorker.java            |  10 +-
 .../cluster/CreateKubernetesClusterCmd.java        |  22 +---
 .../main/resources/conf/k8s-control-node-add.yml   |  43 +++++--
 .../src/main/resources/conf/k8s-control-node.yml   |  46 +++++--
 .../src/main/resources/conf/k8s-node.yml           |  43 +++++--
 .../main/resources/script/upgrade-kubernetes.sh    |   2 +-
 pom.xml                                            |   1 +
 scripts/util/create-kubernetes-binaries-iso.sh     |  22 ++--
 .../java/com/cloud/api/query/QueryManagerImpl.java |   2 +-
 .../deploy/DeploymentPlanningManagerImpl.java      |   9 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |  20 +--
 .../com/cloud/resource/ResourceManagerImpl.java    |  18 ++-
 .../com/cloud/server/ManagementServerImpl.java     |   3 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |   9 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |  14 +--
 .../com/cloud/template/TemplateManagerImpl.java    |  30 ++++-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  27 ++--
 .../cloudstack/backup/BackupManagerImpl.java       |  52 +++++---
 .../storage/resource/HttpUploadServerHandler.java  |   3 +
 systemvm/debian/opt/cloud/bin/setup/cksnode.sh     |   4 +-
 test/integration/smoke/test_kubernetes_clusters.py |  20 +--
 test/integration/smoke/test_service_offerings.py   |  41 ++++++
 .../scripts/configure_systemvm_services.sh         |  15 ++-
 .../scripts/install_systemvm_packages.sh           |   2 +-
 tools/appliance/systemvmtemplate/template.json     |   4 +-
 ui/public/locales/en.json                          |   4 +-
 ui/src/components/header/ProjectMenu.vue           |   2 +-
 ui/src/components/view/SearchView.vue              |  19 ++-
 ui/src/config/section/image.js                     |   1 -
 ui/src/utils/request.js                            |   7 +-
 ui/src/views/compute/AssignInstance.vue            |  28 +++--
 ui/src/views/compute/CreateKubernetesCluster.vue   |   8 --
 ui/src/views/compute/DeployVM.vue                  |   7 +-
 ui/src/views/compute/KubernetesServiceTab.vue      |   3 +
 ui/src/views/infra/AddPrimaryStorage.vue           |   2 +-
 .../main/java/com/cloud/utils/EncryptionUtil.java  |  14 +--
 .../main/java/com/cloud/utils/script/Script.java   |  19 ++-
 .../java/com/cloud/utils/ssh/SSHCmdHelper.java     |  13 +-
 .../cloudstack/utils/security/DigestHelper.java    |  17 ++-
 56 files changed, 836 insertions(+), 523 deletions(-)

Reply via email to