Manual AK/2.5 to CCS/2.5 merge#602
Merged
Merged
Conversation
…pache#11092) The latest JDKs no longer support TLS 1.0/1.1 causing the test to fail. We have already fixed this in trunk and 3.0, so this is for 2.8 and older branches. The relevant trunk commit is 530224e. We had another test with the same issue and it was fixed for all branches via apache#10922. Reviewers: Rajini Sivaram <rajinisivaram@googlemail.com>
Conflicts: clients/src/test/java/org/apache/kafka/common/network/SslTransportLayerTest.java Tests testTLSDefaults and checkAuthentiationFailed didn't exist in CCS Kafka until this merge. They are now.
Author
|
Did a little research here, this seems to be in conflict with #275 Paging Ismael Juma (@ijuma) for advice. |
|
|
||
| selector.close(); | ||
| } | ||
|
|
Member
There was a problem hiding this comment.
We don't need this test in ccs/ce since we reverted the original changes that added the test.
Revert apache#275 Removed These tests - As per discussion in apache#602 these can be left out.
Author
|
Removing these tests effectively made this merge have no delta. Pushing the merge commits so others can get past this merge conflict. |
Manikumar Reddy (omkreddy)
approved these changes
Jul 27, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge conflict from apache@b3edf39 - The tests testTLSDefaults and checkAuthentiationFailed didn't exist in CCS kafka until this merge.
Committer Checklist (excluded from commit message)