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

Drop #2697 from release-1.16 branch #2723

Closed
wants to merge 9 commits into from

Conversation

jchen6585
Copy link
Contributor

What type of PR is this?

cleanup

Which issue does this PR fix:
N/A

What does this PR do / Why do we need it:
Drop #2697 from commit history

If an issue # is not available please add repro steps and logs from IPAMD/CNI showing the issue:

Testing done on this change:

Will this PR introduce any new dependencies?:

Will this break upgrades or downgrades? Has updating a running cluster been tested?:

Does this change require updates to the CNI daemonset config files to work?:

Does this PR introduce any user-facing change?:


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

jchen6585 and others added 9 commits December 21, 2023 17:56
Co-authored-by: Joseph Chen <[email protected]>
…ws-vpc-cni ConfigMap default settings (aws#2716)

* update CHANGELOG, charts, and manifests for v1.15.5 release
* windows prefix delegation settings
Co-authored-by: Joseph Chen <[email protected]>
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.7.6 to 1.7.11.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v1.7.6...v1.7.11)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jchen6585 jchen6585 requested a review from a team as a code owner December 21, 2023 18:04
@jdn5126 jdn5126 changed the title Release 1.16 Drop #2697 from release-1.16 branch Dec 21, 2023
@jdn5126
Copy link
Contributor

jdn5126 commented Dec 21, 2023

Closing in favor of #2724

@jdn5126 jdn5126 closed this Dec 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants