Fix merge conflict with branch-23.12 #9947
Merged
Conversation
This file contains 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
* Fix test and update docs Signed-off-by: Nghia Truong <[email protected]> * Update docs/compatibility.md Co-authored-by: Jason Lowe <[email protected]> * Update docs/compatibility.md Co-authored-by: Jason Lowe <[email protected]> * Fix docs Signed-off-by: Nghia Truong <[email protected]> * Update integration_tests/src/main/python/cmp_test.py --------- Signed-off-by: Nghia Truong <[email protected]> Co-authored-by: Jason Lowe <[email protected]>
|
build |
ttnghia
approved these changes
Dec 4, 2023
revans2
approved these changes
Dec 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves #9931. This resolves the merge conflict between the changes in #9928 and #9719.
NOTE: This needs to be merged with a merge commit, not squashed!