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
omit 7321787899c do not merge
add 0bd7462c54a Link README logo to website (#7884)
add 19aacad46bb UI: Show iso urls (#7869)
add cf249f64a3b api: Force-stop descriptions (#7866)
add e8b491177f1 server: Replace Hashtable with LinkedHashMap in
createIsoResponse (#7844)
add c8d6e505393 VMware: add support for 8.0b (8.0.0.2), 8.0c (8.0.0.3)
(#7380)
add d8a5c890602 server: get only Ready ISO to mount (#7848)
add 87d6c4fbd5f packaging: install tzdata-java or timezone-java (#7875)
add 5b339673109 Fix role escalation prevention (#7853)
add add64bd7e69 security group: replace vm.getPrivateMacAddress() with
nic.getMacAddress() (#7293)
add f7345e861f8 cpvm: Fix CPVM not releasing CPU after closing console
(#7826)
add d296f54c7f2 Api: update command domainId/account descriptions (#7876)
add ddc2a362a88 UI: Add missing tooltips to Register/Upload Templates/ISOs
views (#7879)
add 6d242176363 server: Allow admins to disable the 2FA of users in
subdomains (#7870)
add 6cded7e0102 Support GNU sed apidoc for MacOS build (#7888)
add 405ef82aefd UI: Fix hide delete button for templates that are in
Installing template state (#7882)
add 78bdde9e981 AutoScaling: support Managed User Data (#7769)
add 5097d2aa8bd ui: fix creating zone with vxlan if Guest physical network
is not the last (#7801)
add db0e7a65afb server: check hostId when attach disk to a Stopped vm with
local storage (#7886)
add ea832bce136 Merge branch '4.18'
add 2ef159eeb84 merge issues
add 9af335baa5a 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 (7321787899c)
\
N -- N -- N refs/heads/dummy (9af335baa5a)
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 +-
.../com/cloud/network/as/AutoScaleVmProfile.java | 4 +
.../java/org/apache/cloudstack/api/BaseCmd.java | 17 ++
.../admin/internallb/StopInternalLBVMCmd.java | 2 +-
.../api/command/admin/router/StopRouterCmd.java | 2 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 2 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 15 ++
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 17 ++
.../api/command/user/network/CreateNetworkCmd.java | 4 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 2 +-
.../api/command/user/vm/DeployVMCmd.java | 28 +--
.../api/command/user/vm/ResetVMUserDataCmd.java | 16 +-
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 15 +-
.../cloudstack/api/command/user/vm/StopVMCmd.java | 3 +-
.../api/command/user/vm/UpdateVMCmd.java | 14 +-
.../api/command/user/vm/UpgradeVMCmd.java | 15 +-
.../api/command/user/volume/CreateVolumeCmd.java | 3 +-
.../api/command/user/volume/UploadVolumeCmd.java | 2 +-
.../api/response/AutoScaleVmProfileResponse.java | 48 ++++
.../cloudstack/api/response/UserVmResponse.java | 2 +-
.../engine/orchestration/VolumeOrchestrator.java | 18 +-
.../dao/HypervisorCapabilitiesDaoImpl.java | 7 +
.../com/cloud/network/as/AutoScaleVmProfileVO.java | 24 ++
.../main/java/com/cloud/upgrade/GuestOsMapper.java | 16 ++
.../com/cloud/upgrade/dao/Upgrade41800to41810.java | 119 ++++++++++
.../resources/META-INF/db/schema-41800to41810.sql | 7 +
.../cloud/network/as/AutoScaleVmProfileVOTest.java | 31 +++
packaging/centos8/cloud.spec | 2 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 10 +-
.../command/admin/ratelimit/ResetApiLimitCmd.java | 2 +-
.../cloud/hypervisor/guru/VmwareVmImplementer.java | 16 +-
.../hypervisor/vmware/resource/VmwareResource.java | 21 +-
.../hypervisor/guru/VmwareVmImplementerTest.java | 46 ++++
.../com/cloud/api/commands/StopNetScalerVMCmd.java | 2 +-
.../api/command/ListTungstenFabricTagCmd.java | 2 +-
.../util/ListElastistorVolumeResponse.java | 2 +-
.../api/response/LdapConfigurationResponse.java | 2 +-
.../api/response/LinkAccountToLdapResponse.java | 2 +-
.../api/response/LinkDomainToLdapResponse.java | 2 +-
.../java/com/cloud/api/ApiAsyncJobDispatcher.java | 6 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 14 ++
server/src/main/java/com/cloud/api/ApiServer.java | 3 +
.../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 8 +-
.../com/cloud/api/query/ViewResponseHelper.java | 29 ++-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 53 ++++-
.../network/security/SecurityGroupManagerImpl.java | 2 +-
.../security/SecurityGroupManagerImpl2.java | 2 +-
.../com/cloud/template/TemplateManagerImpl.java | 2 +-
.../java/com/cloud/user/AccountManagerImpl.java | 7 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 6 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 59 ++++-
.../java/com/cloud/api/ApiResponseHelperTest.java | 72 ++++++
.../cloud/network/as/AutoScaleManagerImplTest.java | 75 +++++-
.../com/cloud/user/AccountManagerImplTest.java | 13 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 12 +-
test/integration/smoke/test_internal_lb.py | 7 +-
test/integration/smoke/test_vm_autoscaling.py | 69 ++++++
tools/apidoc/build-apidoc.sh | 8 +-
ui/public/locales/en.json | 1 +
ui/src/config/section/image.js | 2 +-
ui/src/views/compute/AutoScaleVmProfile.vue | 92 ++++++--
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 257 +++++++++++++++++++--
ui/src/views/compute/ResetUserData.vue | 10 +-
ui/src/views/image/RegisterOrUploadIso.vue | 60 +++--
ui/src/views/image/RegisterOrUploadTemplate.vue | 60 +++--
ui/src/views/image/TemplateZones.vue | 17 ++
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 5 +-
.../apache/cloudstack/utils/CloudStackVersion.java | 17 ++
.../cloudstack/utils/CloudStackVersionTest.java | 20 ++
70 files changed, 1304 insertions(+), 230 deletions(-)
