This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.19-dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
discard b7d37115b85 do not merge
add 6c7426e3a7e Prevent network disruption on adding a VPC tier for
redundant VRs (#9251)
add 4e7c6682fd4 While starting VM with considerlasthost enabled, don't
load host tags/details for the last host when it doesn't exist (#9037)
add 56b69b157ea prevent duplicate ip table rules in SSVM (#8530)
add 7c5b7ca0777 Extra parameter for UpdateImageStore (#8941)
add 050ee44137a Merge branch '4.18' into 4.19
add 8b02624e610 User data content size validation, and related code
improvements (#8418)
add 227c15624d9 vxlan: do not create duplicated network for private
gateway (#9232)
add 7a0cd55e989 ui: fix user create featured template from volume (#9253)
add 2315a73a209 User friendly name of Downloaded Templates Volumes and
ISOs (#9252)
add 81269ad62af VNF: add API listVnfAppliances (#8994)
add cc52b38e54d Update extraconfig for platform param in xen/xcpng (#9248)
add 3997e596786 Merge release branch 4.18 to 4.19
add 84b91cc9a3d assertion improvement on cluster DRS (#8508)
add 7dce3d87d48 [linstor] Fix revertSnapshot (#9271)
add 2030bf31e5b 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 (b7d37115b85)
\
N -- N -- N refs/heads/4.19-dummy (2030bf31e5b)
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:
PULL_REQUEST_TEMPLATE.md | 1 +
.../network/VpcVirtualNetworkApplianceService.java | 22 ++-
.../java/com/cloud/storage/StorageService.java | 3 +
.../command/admin/storage/UpdateImageStoreCmd.java | 21 ++-
...Admin.java => ListVnfAppliancesCmdByAdmin.java} | 18 ++-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 2 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 2 +-
.../command/user/userdata/RegisterUserDataCmd.java | 9 +-
.../api/command/user/vm/DeployVMCmd.java | 6 +-
.../ListVnfAppliancesCmd.java} | 20 ++-
.../api/command/user/vm/ResetVMUserDataCmd.java | 2 +-
.../api/command/user/vm/UpdateVMCmd.java | 2 +-
.../api/response/AutoScaleVmProfileResponse.java | 2 +-
.../api/response/ImageStoreResponse.java | 14 +-
.../api/response/VMUserDataResponse.java | 2 +-
.../cloudstack/userdata/UserDataManager.java | 5 +
.../storage/CreateEntityDownloadURLCommand.java | 27 ++--
.../agent/resource/virtualnetwork/VRScripts.java | 1 +
.../virtualnetwork/VirtualRoutingResource.java | 19 +++
.../agent/routing/ManageServiceCommand.java} | 26 +--
.../engine/subsystem/api/storage/DataObject.java | 2 +
.../cloud/configuration/ConfigurationManager.java | 4 -
.../java/com/cloud/storage/StorageManager.java | 2 +
.../cloudstack/userdata/UserDataManagerImpl.java | 83 +++++-----
.../xenserver/ExtraConfigurationUtility.java | 51 ++++--
.../xenserver/ExtraConfigurationUtilityTest.java | 52 ++++++
.../cloud/network/guru/VxlanGuestNetworkGuru.java | 2 +-
.../driver/CloudStackImageStoreDriverImpl.java | 44 ++++--
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 9 +-
.../deploy/DeploymentPlanningManagerImpl.java | 174 +++++++++++----------
.../com/cloud/network/as/AutoScaleManagerImpl.java | 7 +-
.../network/element/VpcVirtualRouterElement.java | 76 +++++----
.../VpcVirtualNetworkApplianceManagerImpl.java | 49 ++++++
.../main/java/com/cloud/server/StatsCollector.java | 17 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 25 ++-
.../cloud/storage/upload/UploadMonitorImpl.java | 4 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 2 -
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 55 +------
.../diagnostics/to/DiagnosticsDataObject.java | 5 +
.../storage/template/VnfTemplateManagerImpl.java | 4 +
.../cloud/network/as/AutoScaleManagerImplTest.java | 10 +-
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 14 ++
.../SecondaryStorageManagerImpl.java | 4 +-
.../storage/resource/IpTablesHelper.java | 66 ++++++++
.../resource/NfsSecondaryStorageResource.java | 20 +--
.../storage/template/DownloadManagerImpl.java | 40 ++---
.../storage/template/UploadManagerImpl.java | 6 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 2 +-
.../debian/opt/cloud/bin/manage_service.sh | 6 +-
test/integration/smoke/test_cluster_drs.py | 61 ++++++--
ui/src/config/section/image.js | 2 +-
ui/src/config/section/infra/secondaryStorages.js | 17 +-
ui/src/config/section/network.js | 4 +-
ui/src/config/section/storage.js | 8 +-
ui/src/views/AutogenView.vue | 1 -
ui/src/views/network/VnfAppliancesTab.vue | 2 +-
.../main/java/com/cloud/utils/script/Script.java | 11 +-
59 files changed, 762 insertions(+), 387 deletions(-)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/{DeployVnfApplianceCmdByAdmin.java
=> ListVnfAppliancesCmdByAdmin.java} (71%)
copy
api/src/main/java/org/apache/cloudstack/api/command/user/{template/ListVnfTemplatesCmd.java
=> vm/ListVnfAppliancesCmd.java} (68%)
copy
core/src/main/java/{com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java =>
org/apache/cloudstack/agent/routing/ManageServiceCommand.java} (67%)
create mode 100644
plugins/hypervisors/xenserver/src/test/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtilityTest.java
create mode 100644
services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/IpTablesHelper.java
copy core/src/main/resources/META-INF/cloudstack/allocator/module.properties
=> systemvm/debian/opt/cloud/bin/manage_service.sh (95%)
mode change 100644 => 100755
