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

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


 discard a87a7cf7754 DO NOT MERGE
     add 0be87ac6545 Fixup CKS UI for external managed clusters (#9434)
     add d606ee7a07b ui: vm metrics note about behaviour across hypervisors 
(#9399)
     add f0ba90568d8 api: Fix missing keys in listZonesMetrics response (#9419)
     add 9033ab709e6 Fix snapshot chain being deleted on XenServer (#9447)
     add 2e0024e216d server, api: account and api entity access improvements
     add d541e9014df Merge branch '4.18' into 4.19
     add 6fbdda951ac [4.19] server, api, ui: access improvements and assorted 
fixes (#22)
     add b73f634ea61 Merge branch '4.19'
     add 47a6b7011d7 Fix build
     add 161d156af1a Support user resource name / displaytext with emoji, 
unicode chars, and some sql exception msg improvements (#9340)
     add cb0527d7050 ui: rename autoscale instance group to simply autoscaling 
group (#9487)
     add 150e7e0b16a Fix imports
     add 21f3fde7b40 libvirtstorageadaptor: better handle failed libvirt 
storagepool destroy (#9390)
     add bf116762788 test: fix component test 
test_acl_sharednetwork_deployVM-impersonation.py (#9499)
     add cc1dcf51b77 Merge remote-tracking branch 'origin/4.19'
     add b429e843cd1 created VPC message a little less misleading (#9396)
     add cf1428ddcca Fix column from op_dc_ip_address_alloc not being 
referenced correctly by its ORM class (#8812)
     add c98f1b8b3ca Ensure affinity groups are honored when VMs are deployed 
in parallel (#9201)
     add 6e6a2766637 add procedures procedure (#9385)
     add 287a47266b0 Merge branch '4.19'
     add 3399abddb0c NSX: add back removed code for NSX (#9435)
     add 01c721fcda5 Improvements to quota tariffs APIs and UI (#9225)
     add 8ca1843efae Allow deletion of system VM templates (#8556)
     add 2ba64f2521a fix removeSecondaryStorageSelector response for docs 
(#9264)
     add f2f1dbc5aee 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   (a87a7cf7754)
            \
             N -- N -- N   refs/heads/healthcheck-main (f2f1dbc5aee)

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                           |   1 +
 .../org/apache/cloudstack/api/ApiArgValidator.java |   5 +
 .../org/apache/cloudstack/api/ApiConstants.java    |   6 +
 .../RemoveSecondaryStorageSelectorCmd.java         |   2 +-
 .../api/command/admin/usage/ListUsageTypesCmd.java |   5 +-
 .../command/user/template/DeleteTemplateCmd.java   |   8 +
 .../api/command/user/vm/DeployVMCmd.java           |   3 +-
 .../api/command/user/vm/UpdateVMCmd.java           |   4 +-
 .../api/response/AcquirePodIpCmdResponse.java      |  10 +-
 .../cloudstack/api/response/ClusterResponse.java   |  38 ++-
 .../cloudstack/api/response/HostResponse.java      |  82 +++++-
 .../api/response/ManagementServerResponse.java     |   4 +
 .../api/response/StoragePoolResponse.java          |  12 +
 .../cloudstack/api/response/UsageTypeResponse.java |  14 +-
 .../cloudstack/api/response/UserVmResponse.java    |   4 +
 .../cloudstack/api/response/VolumeResponse.java    |  18 +-
 .../cloudstack/api/response/ZoneResponse.java      |  30 ++-
 .../org/apache/cloudstack/usage/UsageService.java  |   3 -
 .../org/apache/cloudstack/usage/UsageTypes.java    |  50 ++--
 .../engine/orchestration/NetworkOrchestrator.java  |   6 +
 .../java/com/cloud/dc/DataCenterIpAddressVO.java   |  10 +-
 .../java/com/cloud/dc/dao/DataCenterDaoImpl.java   |  18 +-
 .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java   |  26 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  | 160 ++++++-----
 .../com/cloud/upgrade/dao/Upgrade41910to42000.java |  33 +++
 .../cloudstack/affinity/dao/AffinityGroupDao.java  |   3 +
 .../affinity/dao/AffinityGroupDaoImpl.java         |  12 +
 .../cloud.add_guest_os_and_hypervisor_mapping.sql  |  49 ++++
 .../db/procedures/cloud.idempotent_add_column.sql  |  27 ++
 .../db/procedures/cloud.idempotent_add_key.sql     |  27 ++
 .../cloud.idempotent_add_unique_index.sql          |  26 ++
 .../procedures/cloud.idempotent_add_unique_key.sql |  26 ++
 .../procedures/cloud.idempotent_change_column.sql  |  27 ++
 .../cloud.idempotent_create_unique_index.sql       |  27 ++
 .../cloud.idempotent_drop_foreign_key.sql          |  25 ++
 .../db/procedures/cloud.idempotent_drop_index.sql  |  27 ++
 ...dempotent_insert_guestos_hypervisor_mapping.sql |  48 ++++
 .../db/procedures/usage.idempotent_add_column.sql  |  26 ++
 .../procedures/usage.idempotent_change_column.sql  |  27 ++
 .../db/procedures/usage.idempotent_drop_index.sql  |  25 ++
 .../resources/META-INF/db/schema-41000to41100.sql  |  45 ----
 .../resources/META-INF/db/schema-41520to41600.sql  |  47 ----
 .../resources/META-INF/db/schema-41600to41610.sql  |  54 ----
 .../resources/META-INF/db/schema-41610to41700.sql  |  45 ----
 .../resources/META-INF/db/schema-41720to41800.sql  |  59 ----
 .../resources/META-INF/db/schema-41910to42000.sql  |  72 ++++-
 .../resources/META-INF/db/schema-4910to4920.sql    |  38 ---
 .../storage/snapshot/DefaultSnapshotStrategy.java  |   7 +-
 .../java/com/cloud/utils/db/GenericDaoBase.java    |  65 +++--
 .../cloudstack/quota/dao/QuotaTariffDao.java       |  12 +-
 .../cloudstack/quota/dao/QuotaTariffDaoImpl.java   | 150 ++---------
 .../cloudstack/affinity/HostAffinityProcessor.java |  39 ++-
 .../affinity/HostAntiAffinityProcessor.java        |  99 +++++--
 plugins/database/quota/pom.xml                     |   5 +
 .../api/command/QuotaTariffCreateCmd.java          |   7 +-
 .../cloudstack/api/command/QuotaTariffListCmd.java |  33 ++-
 .../api/command/QuotaTariffUpdateCmd.java          |   8 +-
 .../api/response/QuotaResponseBuilder.java         |   5 +-
 .../api/response/QuotaResponseBuilderImpl.java     |  24 +-
 .../api/command/QuotaTariffListCmdTest.java        |  26 +-
 .../api/command/QuotaTariffUpdateCmdTest.java      |   4 +-
 .../api/response/QuotaResponseBuilderImplTest.java |  78 +++++-
 .../kvm/storage/LibvirtStorageAdaptor.java         |  53 ++--
 .../cluster/KubernetesClusterManagerImpl.java      |   3 +-
 .../src/main/java/com/cloud/acl/DomainChecker.java |  68 +++--
 .../main/java/com/cloud/api/ApiResponseHelper.java |   2 +-
 .../com/cloud/api/dispatch/ParamProcessWorker.java |  43 ++-
 .../cloud/api/query/dao/DataCenterJoinDaoImpl.java |   2 +-
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |   4 +-
 .../com/cloud/network/IpAddressManagerImpl.java    |   2 +-
 .../java/com/cloud/network/NetworkServiceImpl.java | 209 +++++++-------
 .../com/cloud/resource/ResourceManagerImpl.java    |   2 +-
 .../cloud/template/HypervisorTemplateAdapter.java  |   4 +-
 .../java/com/cloud/usage/UsageServiceImpl.java     |   7 -
 .../java/com/cloud/user/AccountManagerImpl.java    |  18 +-
 .../test/java/com/cloud/acl/DomainCheckerTest.java | 166 ++++++++++++
 .../cloud/api/dispatch/ParamProcessWorkerTest.java |  37 +++
 .../com/cloud/user/AccountManagerImplTest.java     |  59 ++++
 ...est_acl_sharednetwork_deployVM-impersonation.py |  16 +-
 test/integration/smoke/test_account_access.py      | 198 ++++++++++++++
 test/integration/smoke/test_resource_names.py      | 299 +++++++++++++++++++++
 tools/marvin/marvin/cloudstackException.py         |   1 +
 ui/public/locales/en.json                          |  97 +++++--
 ui/public/locales/pt_BR.json                       |  53 +++-
 ui/src/components/view/DetailsTab.vue              |  37 ++-
 ui/src/components/view/ListView.vue                |  16 +-
 ui/src/components/view/SearchView.vue              |  44 ++-
 ui/src/components/view/stats/ResourceStatsInfo.vue |   3 +-
 ui/src/config/router.js                            |   3 +-
 ui/src/config/section/plugin/quota.js              | 101 ++++++-
 .../src/style/objects/form.scss                    |  23 +-
 ui/src/utils/date.js                               | 104 +++++++
 ui/src/utils/plugins.js                            |  27 +-
 ui/src/utils/quota.js                              | 124 +++++++++
 ui/src/views/AutogenView.vue                       |   9 +-
 ui/src/views/compute/KubernetesServiceTab.vue      |   4 +-
 ui/src/views/infra/UsageRecords.vue                |   2 +-
 ui/src/views/network/CreateVpc.vue                 |   2 +-
 ui/src/views/plugins/quota/CreateQuotaTariff.vue   | 201 ++++++++++++++
 ui/src/views/plugins/quota/EditQuotaTariff.vue     | 188 +++++++++++++
 ui/src/views/plugins/quota/QuotaTariff.vue         |  63 -----
 .../utils/jsinterpreter/JsInterpreter.java         |   6 +
 .../utils/jsinterpreter/JsInterpreterTest.java     |   4 +-
 103 files changed, 3170 insertions(+), 1010 deletions(-)
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.add_guest_os_and_hypervisor_mapping.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_add_column.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_add_key.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_add_unique_index.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_add_unique_key.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_change_column.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_create_unique_index.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_drop_foreign_key.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_drop_index.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/cloud.idempotent_insert_guestos_hypervisor_mapping.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/usage.idempotent_add_column.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/usage.idempotent_change_column.sql
 create mode 100644 
engine/schema/src/main/resources/META-INF/db/procedures/usage.idempotent_drop_index.sql
 create mode 100644 server/src/test/java/com/cloud/acl/DomainCheckerTest.java
 create mode 100644 test/integration/smoke/test_account_access.py
 create mode 100644 test/integration/smoke/test_resource_names.py
 copy api/src/main/java/org/apache/cloudstack/api/ApiArgValidator.java => 
ui/src/style/objects/form.scss (62%)
 create mode 100644 ui/src/utils/date.js
 create mode 100644 ui/src/utils/quota.js
 create mode 100644 ui/src/views/plugins/quota/CreateQuotaTariff.vue
 create mode 100644 ui/src/views/plugins/quota/EditQuotaTariff.vue
 delete mode 100644 ui/src/views/plugins/quota/QuotaTariff.vue

Reply via email to