You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/11/28 12:44:02 UTC
(cloudstack) branch dummy updated (35218aa99c3 -> 2fb59b86c20)
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
discard 35218aa99c3 do not merge
add cc45bffdbd3 Improved concatenation way in PropertiesStorage.java (#7486)
add 0735b91037d api: introduce domainid and account parameter in createTemplate API (#8210)
add 60017723357 multi local storage handling for kvm (#6699)
add 6eb04a86a6b Fixed Hashmap Key value comparision (#8238)
add db27c0ad2a2 Set number of hours per month with actual number in Quota (#7210)
add adbb5520ca5 Database VIEW management via separated files (#7417)
add c7ed4ca272c schema: revert incorrect removal of oauth changes in #7417 (#8245)
add eaa4123068a VNF: fix UI bugs and polish (#8227)
add 1a2dbebe489 Let Prometheus exporter plugin support utf8 characters (#8228)
add 1b56a8e8733 Fixed spelling and added missing states to response (#8248)
add 98d643efe6c Merge release branch 4.18 to main
add 5c7e4b7edc8 api: add ipaddress argument to disassociateIPAddress (#8222)
add f0b757e91ea [StepSecurity] ci: Harden GitHub Actions (#8209)
add b0a9949775b ui: include domain and account field for createTemplate forms (#8257)
add 60b399f8758 Fix create private gateway rollback (#8244)
add 2fb59b86c20 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 (35218aa99c3)
\
N -- N -- N refs/heads/dummy (2fb59b86c20)
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/build.yml | 3 +
.github/workflows/ci.yml | 3 +
.github/workflows/rat.yml | 3 +
.github/workflows/ui.yml | 3 +
.../cloud/agent/dao/impl/PropertiesStorage.java | 7 +-
.../java/com/cloud/agent/api/StoragePoolInfo.java | 7 +
.../java/com/cloud/network/NetworkService.java | 2 +
api/src/main/java/com/cloud/network/VNF.java | 1 -
.../main/java/com/cloud/server/ResourceTag.java | 2 +-
.../api/command/admin/host/ListHostsCmd.java | 4 +
.../command/admin/storage/ListStoragePoolsCmd.java | 29 +-
.../user/address/DisassociateIPAddrCmd.java | 68 +++-
.../command/user/template/CreateTemplateCmd.java | 129 ++++---
.../api/response/AcquireIPAddressResponse.java | 2 +-
.../cloudstack/api/response/IPAddressResponse.java | 2 +-
.../api/response/PortableIpResponse.java | 2 +-
.../user/template/CreateTemplateCmdTest.java | 16 +
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 28 ++
.../resources/META-INF/db/schema-41810to41900.sql | 396 ---------------------
.../META-INF/db/views/cloud.async_job_view.sql | 129 +++++++
.../META-INF/db/views/cloud.data_center_view.sql | 59 +++
.../META-INF/db/views/cloud.disk_offering_view.sql | 82 +++++
.../META-INF/db/views/cloud.domain_router_view.sql | 126 +++++++
.../db/views/cloud.network_offering_view.sql | 85 +++++
.../db/views/cloud.service_offering_view.sql | 114 ++++++
.../META-INF/db/views/cloud.snapshot_view.sql | 107 ++++++
.../META-INF/db/views/cloud.template_view.sql | 131 +++++++
.../META-INF/db/views/cloud.user_view.sql | 65 ++++
.../META-INF/db/views/cloud.user_vm_view.sql | 215 +++++++++++
.../cloud/network/as/AutoScaleVmProfileVOTest.java | 24 +-
.../apache/cloudstack/quota/QuotaManagerImpl.java | 12 +-
.../cloudstack/quota/QuotaManagerImplTest.java | 2 +
.../metrics/PrometheusExporterServerImpl.java | 19 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 83 ++---
.../java/com/cloud/api/query/QueryManagerImpl.java | 27 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 5 +
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 39 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 110 +++++-
.../com/cloud/tags/ResourceManagerUtilImpl.java | 1 +
.../com/cloud/network/vpc/VpcManagerImplTest.java | 23 ++
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 9 +
test/integration/smoke/test_network.py | 62 +++-
tools/marvin/marvin/lib/base.py | 9 +-
ui/public/locales/en.json | 27 +-
ui/src/components/header/CreateMenu.vue | 19 +
ui/src/components/view/DetailsTab.vue | 8 +-
ui/src/config/section/network.js | 1 +
ui/src/config/section/storage.js | 9 +-
ui/src/views/compute/DeployVnfAppliance.vue | 11 +-
ui/src/views/compute/MigrateVMStorage.vue | 2 +-
ui/src/views/compute/MigrateWizard.vue | 2 +-
.../views/compute/wizard/NetworkConfiguration.vue | 8 +-
ui/src/views/image/TemplateVnfSettings.vue | 3 +-
ui/src/views/infra/AddPrimaryStorage.vue | 32 +-
ui/src/views/storage/CreateTemplate.vue | 92 ++++-
ui/tests/mockData/MigrateWizard.mock.json | 6 +
utils/src/main/java/com/cloud/utils/DateUtil.java | 5 +
utils/src/main/java/com/cloud/utils/FileUtil.java | 33 ++
58 files changed, 1908 insertions(+), 595 deletions(-)
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.async_job_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.data_center_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.disk_offering_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.domain_router_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.network_offering_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.service_offering_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.snapshot_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.template_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.user_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.user_vm_view.sql