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 bd6ede87bd7 do not merge add db572f4478d Fix spelling, word case, duplicate words in code comments only (#8987) add f7b95cd8f06 UI: hide Cleanup/Expunge when delete a CloudManaged CKS cluster (#8593) add 027149487b5 Fix: Update rootdisksize detail on restore VM (#8981) add d5241d319c3 Merge release branch 4.19 to main add 981310c2fe7 UI: Fix the Add / Remove Vmware DC button on Zone detail view (#8781) add d1ca79b65b3 ui: show systemvm agent version in the list and resource view (#9011) add 5c9d79e3fb4 Upgrade org.json:json version (#8750) add aad410ae6c0 Merge remote-tracking branch 'origin/4.18' into 4.19 add 433956c6ae1 Merge remote-tracking branch 'origin/4.19' add 6a3c20c72f6 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 (bd6ede87bd7) \ N -- N -- N refs/heads/dummy (6a3c20c72f6) 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: pom.xml | 2 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 26 +++++-- .../integration/component/test_ps_resize_volume.py | 6 +- test/integration/plugins/linstor/README.md | 12 ++-- test/integration/plugins/scaleio/README.md | 16 ++--- test/integration/testpaths/testpath_usage.py | 84 +++++++++++----------- ui/src/config/section/compute.js | 3 + ui/src/config/section/infra/systemVms.js | 4 +- ui/src/views/AutogenView.vue | 6 ++ 9 files changed, 91 insertions(+), 68 deletions(-)