Skip to content

Synchronise master with upstream#460

Merged
Alex-Welsh merged 3 commits intostackhpc/masterfrom
upstream/master-2025-08-11
Aug 11, 2025
Merged

Synchronise master with upstream#460
Alex-Welsh merged 3 commits intostackhpc/masterfrom
upstream/master-2025-08-11

Conversation

@github-actions
Copy link
Copy Markdown

This PR contains a snapshot of master from upstream master.

bbezak and others added 3 commits August 4, 2025 16:06
Change-Id: Id7fdbd3871e4385455767cb14fb167140ee0d55d
Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
Skip the admin OS_CACERT line when rendering public-openrc.
Recent change [1] introduced that.
It occurs only when both admin and public cacert variables are set.

[1] https://review.opendev.org/c/openstack/kayobe/+/949624

Closes-Bug: #2116318

Change-Id: I29c0c6bf77e919940c3452b1f5d219462552cdff
Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
@github-actions github-actions Bot added the automated Automated action performed by GitHub Actions label Aug 11, 2025
@github-actions github-actions Bot requested a review from a team as a code owner August 11, 2025 06:21
@Alex-Welsh Alex-Welsh closed this Aug 11, 2025
@Alex-Welsh Alex-Welsh reopened this Aug 11, 2025
@Alex-Welsh Alex-Welsh merged commit 44cbd12 into stackhpc/master Aug 11, 2025
4 checks passed
@Alex-Welsh Alex-Welsh deleted the upstream/master-2025-08-11 branch August 11, 2025 08:34
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