This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard f6a9d80bd74 do not merge
add e520525fe73 Use parameter dcId as wrapper to prevent NPE (#8986)
add b91c3879c81 ui: add support to change Account role for admins (#9012)
add ea11128cb37 linstor: disconnect-disk also search for resource name in
Linstor (#9035)
add 92ba4765930 Merge release branch 4.18 to 4.19
add 0d8f7d40037 Merge release branch 4.19 to main
add 0d1bc7dfd0c Limit `listRoles` API visibility (#8639)
add f80d2052845 linstor: Fix volume format and make resource available on
copy target (#8811)
add 87e7c57d08c Fixup e2e test_restore_vm (#9025)
add e9ff2707bbd Merge branch '4.19'
add 21af134087a Fix exceeding of resource limits with powerflex (#9008)
add 5f73172bcbe Fix failure test with
ConfigKeyScheduledExecutionWrapperTest (#9103)
add 2a63483b4c5 framework/config: make logic in ::value() defensive (#9108)
add 6b4955affe9 Fix message publish in transaction (#8980)
add a0f87187da1 ui: fix documentation link for VM autoscaling (#9044)
add ea9a0f4adf8 ui: fix haenable in edit vm form (#9049)
add f0df8d7831a ui: fix limit format (#9060)
add 33659fdf069 server,test: fix resourceid for VOLUME.DETROY in restore
VM (#9032)
add b38f1364e6a Merge branch '4.19'
add e817e04343a Fix typo keyparis -> keypairs in
InvalidParameterValueException (#9100)
add c6762f1a41d ui: fix projectrolepermissions listing with description
(#9091)
add daf6b9d1030 api,ui: vm template format, fix vm info link (#9094)
add 2d4d370be80 ui: support isdynamicallyscalable param for iso (#9092)
add 57e67afdf0d api,server: list autoscalevmgroups with keyword (#9046)
add acce88ff392 Merge remote-tracking branch 'apache/4.19'
add 8ab259bee22 donot 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 (f6a9d80bd74)
\
N -- N -- N refs/heads/dummy (8ab259bee22)
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:
README.md | 2 +-
.../java/com/cloud/user/ResourceLimitService.java | 2 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../cloudstack/api/response/UserVmResponse.java | 12 ++
.../service/VolumeOrchestrationService.java | 3 +-
.../subsystem/api/storage/EndPointSelector.java | 2 +-
.../api/storage/PrimaryDataStoreDriver.java | 16 ++
.../cloud/configuration/ConfigurationManager.java | 3 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 3 +-
.../engine/orchestration/NetworkOrchestrator.java | 34 +++--
.../engine/orchestration/VolumeOrchestrator.java | 50 ++++++-
.../META-INF/db/views/cloud.user_vm_view.sql | 1 +
.../storage/endpoint/DefaultEndPointSelector.java | 3 +-
.../cloudstack/framework/config/ConfigKey.java | 2 +-
.../contrail/management/MockAccountManager.java | 5 +
.../kvm/storage/LinstorStorageAdaptor.java | 7 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 54 +++++++
.../driver/ScaleIOPrimaryDataStoreDriver.java | 10 ++
.../driver/ScaleIOPrimaryDataStoreDriverTest.java | 33 +++++
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 1 +
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 8 +
.../configuration/ConfigurationManagerImpl.java | 17 ++-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 5 +
.../resourcelimit/ResourceLimitManagerImpl.java | 13 ++
.../com/cloud/storage/VolumeApiServiceImpl.java | 18 +++
.../main/java/com/cloud/user/AccountManager.java | 2 +
.../java/com/cloud/user/AccountManagerImpl.java | 5 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 115 +++++++++------
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 103 ++++++++++---
.../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 40 ++---
.../com/cloud/user/MockAccountManagerImpl.java | 4 +
.../java/com/cloud/vm/UserVmManagerImplTest.java | 34 +++++
.../cloud/vpc/MockConfigurationManagerImpl.java | 5 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 6 +
.../apache/cloudstack/acl/RoleManagerImplTest.java | 162 ++++++++++++++++-----
.../component/test_resource_limit_tags.py | 44 ++++++
test/integration/smoke/test_events_resource.py | 15 +-
test/integration/smoke/test_restore_vm.py | 105 +++++++++++--
tools/marvin/marvin/lib/base.py | 20 ++-
ui/public/locales/en.json | 1 +
ui/src/components/view/InfoCard.vue | 2 +-
ui/src/config/section/account.js | 2 +-
ui/src/config/section/compute.js | 2 +-
ui/src/config/section/image.js | 2 +-
ui/src/views/compute/EditVM.vue | 3 +-
ui/src/views/dashboard/UsageDashboard.vue | 6 +-
ui/src/views/image/RegisterOrUploadIso.vue | 71 +++++----
ui/src/views/image/UpdateISO.vue | 8 +-
.../views/project/iam/ProjectRolePermissionTab.vue | 2 +-
49 files changed, 857 insertions(+), 207 deletions(-)
