Skip to content

Synchronise master with upstream#535

Merged
Alex-Welsh merged 8 commits into
stackhpc/masterfrom
upstream/master-2026-05-18
May 18, 2026
Merged

Synchronise master with upstream#535
Alex-Welsh merged 8 commits into
stackhpc/masterfrom
upstream/master-2026-05-18

Conversation

@github-actions
Copy link
Copy Markdown

This PR contains a snapshot of master from upstream master.

osfrickler and others added 8 commits April 22, 2026 09:53
This was missed in [0].

[0] https://review.opendev.org/c/openstack/kolla/+/972998

Signed-off-by: Dr. Jens Harbott <harbott@osism.tech>
Change-Id: Ic0e2a2f6c5269a93ff523a8eab52a822d8d40c5c
This container is gone - we use Ironic built in inspector.

Trivial-fix

Change-Id: Ia1e3dbac1ac104eceba79e6387d9692cc9ac56ee
Signed-off-by: Doug Szumski <doug@stackhpc.com>
Include the theme directory in settings_bundle so theme-only changes
invalidate the cache and rebuild the static assets.

Closes-Bug: #2148389

Change-Id: If4fbc24c5c339f7dee7bf67a09fc6448ede0c9fd
Signed-off-by: Grzegorz Koper <grzegorzk@stackhpc.com>
The release notes job was changed [1], leading to build failures.
Resolve by ignoring errors in existing files.

[1] https://lists.openstack.org/archives/list/openstack-discuss@lists.openstack.org/thread/RLOKQLQUDAVSML4C4OW2EM4OXOGRCYBA/

Change-Id: I3db224fbf7ffaf153fb6307d506fdad980bb429d
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
Add file to the reno documentation build to show release notes for
stable/2026.1.

Use pbr instruction to increment the minor version number
automatically so that master versions are higher than the versions on
stable/2026.1.

Sem-Ver: feature
Change-Id: I5b72baf1137e1307cb4c67e05281236a772e430c
Signed-off-by: OpenStack Release Bot <infra-root@openstack.org>
Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/add_release_note_page.sh
@github-actions github-actions Bot requested a review from a team as a code owner May 18, 2026 07:43
@github-actions github-actions Bot added automated Automated action performed by GitHub Actions synchronisation labels May 18, 2026
@Alex-Welsh Alex-Welsh closed this May 18, 2026
@Alex-Welsh Alex-Welsh reopened this May 18, 2026
@Alex-Welsh Alex-Welsh enabled auto-merge May 18, 2026 07:59
@Alex-Welsh Alex-Welsh merged commit 9124bcf into stackhpc/master May 18, 2026
3 checks passed
@Alex-Welsh Alex-Welsh deleted the upstream/master-2026-05-18 branch May 18, 2026 08:00
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.

6 participants