This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit afec876951fd3539a433a7a2e0bfac64b5c1b77a Merge: 729e6d14465 56d98ea2e74 Author: Daan Hoogland <[email protected]> AuthorDate: Thu Jul 20 13:41:20 2023 +0200 Merge release branch 4.18 to main * 4.18: SSVM: 'allow from' private IP in other SSVMs if the public IP is in allowed internal sites cidrs (#7288) eof added to StorPoolStatsCollector (#7754) .../cloud/storage/template/TemplateConstants.java | 4 +-- .../datastore/driver/StorPoolStatsCollector.java | 2 +- .../SecondaryStorageManagerImpl.java | 36 +++++++++++++++++----- systemvm/agent/scripts/ipfirewall.sh | 2 +- 4 files changed, 32 insertions(+), 12 deletions(-)
