Skip to content

Merge to main: SCHED-2971 Bump tailscale and busybox images - #1274

Merged
asteny merged 3 commits into
soperator-release-5.0from
merge-to-main-from/SCHED-2971
Oct 28, 2026
Merged

asteny merged 3 commits into
soperator-release-5.0from
merge-to-main-from/SCHED-2971

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Merge back to main of the Pull Request #1273 by @asteny

Original PR Description

Release Notes (Mandatory Description)


You cannot skip this merge, but if you really don't want these changes (conflicts or doesn't make sense), just comment /revert-last-pr, and wait for the revert to come, then merge this PR (even if 0 changes).

# Conflicts:
#	soperator/modules/slurm/templates/helm_values/flux_release_nodesets.yaml.tftpl
#	soperator/modules/slurm/templates/helm_values/terraform_fluxcd_values.yaml.tftpl
@github-actions github-actions Bot added the size/S PR changes 11–50 lines label Oct 27, 2026
asteny
asteny previously approved these changes Oct 27, 2026
@asteny
asteny changed the base branch from main to soperator-release-5.0 October 28, 2026 08:23
@asteny
asteny dismissed their stale review October 28, 2026 08:23

The base branch was changed.

@asteny
asteny merged commit 60c18e2 into soperator-release-5.0 Oct 28, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/S PR changes 11–50 lines

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant