Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.12 Backports 2024-01-29 #30511

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Conversation

joamaki
Copy link
Contributor

@joamaki joamaki commented Jan 29, 2024

PRs skipped due to conflicts:

Once this PR is merged, a GitHub action will update the labels of these PRs:

 30403 30410

[ upstream commit 09f18fd ]

Signed-off-by: Filip Nikolic <oss.filipn@gmail.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
@joamaki joamaki added kind/backports This PR provides functionality previously merged into master. backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. labels Jan 29, 2024
@joamaki
Copy link
Contributor Author

joamaki commented Jan 29, 2024

/test-backport-1.12

@julianwiedmann
Copy link
Member

Given that the 4.9 verifier hates the change, let's drop it. Not worth the trouble :).

@joamaki joamaki force-pushed the pr/v1.12-backport-2024-01-29 branch from b0ef92d to 7a45ed5 Compare January 30, 2024 09:50
@joamaki joamaki marked this pull request as ready for review January 30, 2024 09:50
@joamaki joamaki requested a review from a team as a code owner January 30, 2024 09:50
@julianwiedmann
Copy link
Member

Docs change, merging.

@julianwiedmann julianwiedmann merged commit 5380b94 into v1.12 Jan 30, 2024
34 checks passed
@julianwiedmann julianwiedmann deleted the pr/v1.12-backport-2024-01-29 branch January 30, 2024 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

3 participants