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

Preparing 1.5.x branch for next release. #4462

Merged
merged 2 commits into from
Jan 16, 2025

Conversation

nitin-sachdev-29
Copy link
Collaborator

Changes proposed in this PR

  • Preparing 1.5.x branch for next release.

How I've tested this PR

How I expect reviewers to test this PR

Checklist

* * updated consul-dataplane version to 1.5.5, executed go mod tidy and added CHANGELOG.md

* updated golang.org/x/net dependency to 0.34.0 to fix vulnerability https://pkg.go.dev/vuln/GO-2024-3333

* updated golang.org/x/net dependency to 0.34.0 to fix vulnerability https://pkg.go.dev/vuln/GO-2024-3333 in CNI, acceptance and control-plane submodule.

* added CHANGELOG.md

* suppressing vulnerability GO-2022-0635 for release

* added changelog file

* downgraded the consul version to 1.19.3

* downgraded the consul version to 1.19.2
@nitin-sachdev-29 nitin-sachdev-29 added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport signals that a PR will not contain a backport label labels Jan 15, 2025
@nitin-sachdev-29 nitin-sachdev-29 enabled auto-merge (squash) January 15, 2025 16:27
dhiaayachi
dhiaayachi previously approved these changes Jan 15, 2025
Copy link
Collaborator

@dhiaayachi dhiaayachi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nitin-sachdev-29 should not this be merged to release/1.5.x ? 🤔

@nitin-sachdev-29 nitin-sachdev-29 changed the base branch from release/1.5.5 to release/1.5.x January 16, 2025 05:23
@nitin-sachdev-29 nitin-sachdev-29 dismissed dhiaayachi’s stale review January 16, 2025 05:23

The base branch was changed.

@srahul3 srahul3 requested a review from dhiaayachi January 16, 2025 05:57
Copy link
Contributor

@srahul3 srahul3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ LGTM

@nitin-sachdev-29 nitin-sachdev-29 merged commit a1c6c1b into release/1.5.x Jan 16, 2025
57 of 58 checks passed
@nitin-sachdev-29 nitin-sachdev-29 deleted the post-release-1.5.5 branch January 16, 2025 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/no-backport signals that a PR will not contain a backport label pr/no-changelog PR does not need a corresponding .changelog entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants