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.

Sign up for GitHub

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

Jump to bottom

Update master branch - Changelog and Version for CNI 1.19.2 #3171

Merged
merged 1 commit into from
Jan 4, 2025
Merged

Update master branch - Changelog and Version for CNI 1.19.2 #3171

merged 1 commit into from
Jan 4, 2025

Conversation

orsenthil
Copy link
Member 

$ git cherry-pick -X theirs 847372a017457306cf7d14c65094c1cdc70f8971
Auto-merging CHANGELOG.md
Auto-merging charts/aws-vpc-cni/Chart.yaml
Auto-merging charts/aws-vpc-cni/README.md
Auto-merging charts/aws-vpc-cni/values.yaml
Auto-merging charts/cni-metrics-helper/Chart.yaml
Auto-merging charts/cni-metrics-helper/README.md
Auto-merging charts/cni-metrics-helper/values.yaml
Auto-merging config/master/aws-k8s-cni-cn.yaml
Auto-merging config/master/aws-k8s-cni-us-gov-east-1.yaml
Auto-merging config/master/aws-k8s-cni-us-gov-west-1.yaml
Auto-merging config/master/aws-k8s-cni.yaml
Auto-merging config/master/cni-metrics-helper-cn.yaml
Auto-merging config/master/cni-metrics-helper-us-gov-east-1.yaml
Auto-merging config/master/cni-metrics-helper-us-gov-west-1.yaml
Auto-merging config/master/cni-metrics-helper.yaml
Auto-merging scripts/generate-cni-yaml.sh
Auto-merging scripts/run-cni-release-tests.sh
[update_changelog 9efc7f2f] Update Changelog and Version for CNI 1.19.2
 Date: Thu Dec 19 01:19:24 2024 +0000
 17 files changed, 84 insertions(+), 68 deletions(-)

@orsenthil orsenthil requested a review from a team as a code owner January 3, 2025 23:25
yash97
yash97 approved these changes Jan 3, 2025
View reviewed changes
Copy link
Contributor

@yash97 yash97 left a comment

Choose a reason for hiding this comment

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

lgtm

@orsenthil orsenthil merged commit 57c1b38 into aws:master Jan 4, 2025
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yash97 yash97 yash97 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@orsenthil @yash97