Skip to content

Synchronise 2026.1 with upstream#553

Merged
Alex-Welsh merged 6 commits into
stackhpc/2026.1from
upstream/2026.1-2026-06-15
Jun 15, 2026
Merged

Synchronise 2026.1 with upstream#553
Alex-Welsh merged 6 commits into
stackhpc/2026.1from
upstream/2026.1-2026-06-15

Conversation

@github-actions

Copy link
Copy Markdown

This PR contains a snapshot of 2026.1 from upstream stable/2026.1.

mnasiadka and others added 6 commits June 9, 2026 06:40
Needed-By: https://review.opendev.org/c/openstack/kolla-ansible/+/992020

Related-Bug: #2155865

Change-Id: I1c67f6b0f4780b7caf83ccf95a20861d9fefe20b
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
(cherry picked from commit 7477b22)
4.15.0 is out and it broke openstack.cloud modules

Change-Id: I8e0f7663339964ca4418e38314adcb0487833464
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
This reverts commit 214fc1c.

Reason for revert: openstack.cloud 2.6.0 was released with a fix

Signed-off-By: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I68999a73556dcce3060c9059d9b6a3cec122acbb
Switch from jinja2.Environment to
jinja2.sandbox.SandboxedEnvironment to block Server-Side Template
Injection attacks.

Closes-Bug: #2146056

Change-Id: Iecd1d8dcf99007e3339120961c7c1d0ca12f83d8
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
(cherry picked from commit 0b20ffc)
@github-actions github-actions Bot added the automated Automated action performed by GitHub Actions label Jun 15, 2026
@github-actions github-actions Bot requested a review from a team as a code owner June 15, 2026 08:27
@github-actions github-actions Bot added synchronisation automated Automated action performed by GitHub Actions labels Jun 15, 2026
@Alex-Welsh Alex-Welsh merged commit c07a7a3 into stackhpc/2026.1 Jun 15, 2026
3 checks passed
@Alex-Welsh Alex-Welsh deleted the upstream/2026.1-2026-06-15 branch June 15, 2026 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automated Automated action performed by GitHub Actions synchronisation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants