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

weizhouapache pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard c89baae5a4a 4.21/main Health Check, please don't merge this!
     add a47091431a9 Fix select search icon orientation in dropdown menu 
(#13170)
     add 1fe486f493b Add ROOT CAs to the trust store and allow force 
provisioning of certs hosts & systemVMs via ssh (#12911)
     add 850b44317a4 fix(linstor): verify resource deletion completes; warn if 
stuck in DELETING (#13076)
     add 6b831f5196c Live scaling for VMs with fixed service offerings on KVM 
(#12975)
     add 470e95964bc Change disk-only VM snapshot removal message (#11182)
     add a289bb0e6c0 Update suse15 packaging spec, use qemu-ovmf-x86_64 package 
instead of edk2-ovmf for agent (#13133)
     add 348ce953a99 Updating pom.xml version numbers for release 4.22.1.0
     add 79bb8ef1cc3 Updating pom.xml version numbers for release 
4.22.2.0-SNAPSHOT
     add 4a49ffa9aa2 update debian change log
     add 3285e2fad87 systemvm: accept ipv6 established/related return traffic 
(#13173)
     add ca4645320e2 Move checkRoleEscalation outside DB transaction in 
createAccount (#13044)
     add 35ac91e58b8 Change exception treatment on incremental snapshot wait 
(#12665)
     add d1e1aa5d203 VM Deployment using snapshot in new zone (#13178)
     add 9f96c9d5eb9 Flexibilize public IP selection (#11076)
     add 08b1d387557 adaptive: honor user-provided capacityBytes when provider 
stats are unavailable (#13059)
     add a7c2a059f5d Update mysql java connector version to 8.4.0 (matching 
version for MySQL 8.4) (#12640)
     add c165806d3b8 Fix VPC network offerings listing in isolated network 
creation form (#12645)
     add c267ad39bcd Fix/flasharray delete rename destroy patch conflict 
(#13049)
     add 21b2025c505 Merge release branch 4.20 to 4.22
     add 67b849f3efd Merge release branch 4.22 to main
     add a0aafe2fa73 Update bouncy castle (#12794)
     add d48058c379c 4.21/main 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   (c89baae5a4a)
            \
             N -- N -- N   refs/heads/healthcheck-main (d48058c379c)

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:
 .github/workflows/ci.yml                           |   2 +-
 .../com/cloud/agent/api/to/VirtualMachineTO.java   |   8 +-
 .../command/admin/ca/ProvisionCertificateCmd.java  |  12 +-
 .../java/org/apache/cloudstack/ca/CAManager.java   |  31 +-
 client/pom.xml                                     |  18 +-
 .../java/com/cloud/agent/api/ScaleVmCommand.java   |   9 +-
 debian/changelog                                   |  14 +-
 .../java/com/cloud/capacity/CapacityManager.java   |  14 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  40 +-
 .../cloud/network/dao/PublicIpQuarantineDao.java   |  12 +
 .../network/dao/PublicIpQuarantineDaoImpl.java     |  22 +
 .../resources/META-INF/db/schema-42210to42300.sql  |  18 +
 packaging/el8/cloud.spec                           |   2 +-
 packaging/suse15                                   |   1 -
 packaging/suse15/cloud-ipallocator.rc              |   1 +
 packaging/suse15/cloud.limits                      |   1 +
 packaging/{el8 => suse15}/cloud.spec               |  12 +-
 packaging/suse15/cloudstack-agent.te               |   1 +
 packaging/suse15/cloudstack-sccs                   |   1 +
 packaging/suse15/filelimit.conf                    |   1 +
 packaging/{el8 => suse15}/replace.properties       |   8 +-
 packaging/systemd/cloudstack-management.default    |   2 +-
 packaging/systemd/cloudstack-usage.default         |   2 +-
 .../ca/provider/RootCACustomTrustManager.java      |   8 +-
 .../cloudstack/ca/provider/RootCAProvider.java     | 172 ++++--
 .../ca/provider/RootCACustomTrustManagerTest.java  |  37 +-
 .../cloudstack/ca/provider/RootCAProviderTest.java | 107 +++-
 .../mom/webhook/WebhookDeliveryThread.java         |   6 +-
 .../kvm/resource/LibvirtComputingResource.java     | 157 ++++--
 .../kvm/resource/LibvirtDomainXMLParser.java       |   2 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |  17 +-
 .../wrapper/LibvirtScaleVmCommandWrapper.java      |   5 +-
 .../kvm/storage/KVMStorageProcessor.java           |   2 +-
 .../kvm/resource/LibvirtComputingResourceTest.java | 116 +++-
 plugins/integrations/kubernetes-service/pom.xml    |  10 -
 plugins/pom.xml                                    |   4 +-
 plugins/storage/object/minio/pom.xml               |  16 +-
 plugins/storage/object/simulator/pom.xml           |   4 +-
 .../lifecycle/AdaptiveDataStoreLifeCycleImpl.java  |  13 +-
 .../adapter/flasharray/FlashArrayAdapter.java      |  67 ++-
 .../kvm/storage/LinstorStorageAdaptor.java         |  11 +
 .../driver/LinstorPrimaryDataStoreDriverImpl.java  |  14 +
 .../storage/datastore/util/LinstorUtil.java        |  52 ++
 plugins/user-authenticators/ldap/pom.xml           |  40 ++
 pom.xml                                            |  23 +-
 scripts/util/keystore-cert-import                  |  20 +-
 .../com/cloud/capacity/CapacityManagerImpl.java    |   2 +-
 .../main/java/com/cloud/hypervisor/KVMGuru.java    | 148 ++---
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |  55 +-
 .../com/cloud/network/IpAddressManagerImpl.java    |  91 ++--
 .../java/com/cloud/user/AccountManagerImpl.java    |  17 +-
 .../src/main/java/com/cloud/vm/UserVmManager.java  |   4 +
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 100 ++--
 .../org/apache/cloudstack/ca/CAManagerImpl.java    | 223 +++++++-
 .../java/com/cloud/hypervisor/KVMGuruTest.java     | 123 ++---
 .../com/cloud/network/IpAddressManagerTest.java    |   1 +
 .../java/com/cloud/vm/UserVmManagerImplTest.java   | 606 ++++++++++++---------
 .../apache/cloudstack/ca/CABackgroundTaskTest.java |  10 +-
 .../apache/cloudstack/ca/CAManagerImplTest.java    | 223 +++++++-
 services/console-proxy/rdpconsole/pom.xml          |   4 +-
 setup/db/deploy-db-dev.sh                          |   5 +-
 systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py    |   2 +-
 systemvm/patch-sysvms.sh                           |  23 +-
 .../component/test_escalations_instances.py        |   3 -
 .../component/test_escalations_ipaddresses.py      |   9 +-
 test/integration/smoke/test_certauthority_root.py  | 177 +++++-
 test/integration/smoke/test_quarantined_ips.py     |   8 +-
 tools/docker/Dockerfile                            |   2 +-
 tools/marvin/setup.py                              |   2 +-
 ui/public/locales/el_GR.json                       |   2 -
 ui/public/locales/en.json                          |   3 +-
 ui/public/locales/ja_JP.json                       |   1 -
 ui/public/locales/pt_BR.json                       |   3 +-
 ui/public/locales/te.json                          |   1 -
 ui/public/locales/zh_CN.json                       |   1 -
 ui/src/config/section/compute.js                   |   7 +-
 ui/src/config/section/infra/hosts.js               |   2 +-
 ui/src/style/ant-overwrite/ant-form.less           |   2 +-
 ui/src/views/AutogenView.vue                       |  14 +-
 ui/src/views/compute/ScaleVM.vue                   |  37 +-
 ui/src/views/compute/wizard/ComputeSelection.vue   |  12 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue |  22 +-
 .../java/com/cloud/usage/UsageSanityChecker.java   |   2 +-
 utils/pom.xml                                      |   6 +-
 utils/src/main/java/com/cloud/utils/nio/Link.java  |   2 +-
 .../cloudstack/utils/security/CertUtils.java       |  15 +-
 .../cloudstack/utils/security/KeyStoreUtils.java   |   1 -
 .../cloudstack/utils/security/CertUtilsTest.java   |  17 +-
 88 files changed, 2278 insertions(+), 845 deletions(-)
 delete mode 120000 packaging/suse15
 create mode 120000 packaging/suse15/cloud-ipallocator.rc
 create mode 120000 packaging/suse15/cloud.limits
 copy packaging/{el8 => suse15}/cloud.spec (98%)
 create mode 120000 packaging/suse15/cloudstack-agent.te
 create mode 120000 packaging/suse15/cloudstack-sccs
 create mode 120000 packaging/suse15/filelimit.conf
 copy packaging/{el8 => suse15}/replace.properties (89%)

Reply via email to