-
Notifications
You must be signed in to change notification settings - Fork 9.8k
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
Update 3.4, 3.5, and 3.6 changelogs for adding configurable cipher list to gRPC proxy #14524
Conversation
Please also update the changelog-3.4 after you backport the fix to 3.4. |
598d371
to
4120299
Compare
Codecov Report
@@ Coverage Diff @@
## main #14524 +/- ##
=======================================
Coverage 75.50% 75.50%
=======================================
Files 457 457
Lines 37276 37276
=======================================
+ Hits 28146 28147 +1
+ Misses 7362 7354 -8
- Partials 1768 1775 +7
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dusk125 thanks but why are removing the entry from the 3.6 changelog? I think you just need to update the 3.5 changelog. Also, I think you may not need a separate PR (this PR) for changelog as the PR #14500 is still open and you can modify the changelog there to keep it clean (something you did in the #14308). Thanks!
@spzala Please refer to #14476 (comment) to get the reason of why removing the changelog item from 3.6. Please also kindly share your thoughts. Probably we should clearly document the rules in CHANGELOG/README.md if you agree. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please fix merge conflict. Thanks @dusk125
@ahrtr thanks and I see, I am fine with the PR changes in that case. And, yes, we definitely should update the changelog README. I think we need some more discussions, and we can discuss it more cleanly in a PR for README update. Hope that makes sense. |
Makes sense to me. Please feel free to deliver a PR for this or Please let me know if you want me to deliver a PR. |
Thanks both @dusk125 and @spzala There is a discussion recently related to the rules of adding changelog items. FYI. #14570 (comment) . Based on the discussion, the main changelog gives one place to see what's changed over previous minor or major release, so we should add the changelog item for 3.6 back. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add an item for 3.4 and add the item for 3.6 back.
@dusk125 Please update this PR per the comment above so that we can merge it. |
d091e1c
to
8c328ae
Compare
Please rebase this PR and add the changelog item for 3.6 back (FYI. #14524 (comment) ) |
8c328ae
to
c84c634
Compare
Signed-off-by: Allen Ray <alray@redhat.com>
c84c634
to
514c8b2
Compare
This PR was the one that removed the 3.6 changelog entry; since it didn't get merged before the change was backported to 3.4, the 3.6 changelog entry is still there and hasn't been removed. |
Thanks for the clarification. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thank you @dusk125
Since I'm backporting #14308 from 3.6 to 3.5, I need to move the changelog line to 3.5