Fix conflict 0.4 to 0.5 #1822
Merged
Fix conflict 0.4 to 0.5 #1822
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
Signed-off-by: Sameer Raheja <sraheja@nvidia.com>
Signed-off-by: Peixin Li <pxli@nyu.edu>
pxLi
added
documentation
pxLi
requested review from
GaryShen2008,
jlowe,
NvTimLiu,
revans2 and
tgravescs
as code owners
|
build |
GaryShen2008
approved these changes
Feb 26, 2021
|
failed due to cudf error, looks like new cudf jar w/ fix rapidsai/cudf#7449 just got deployed. try re-trigger |
|
build |
nartal1
pushed a commit
to nartal1/spark-rapids
that referenced
this pull request
Jun 9, 2021
Fix conflict 0.4 to 0.5
nartal1
pushed a commit
to nartal1/spark-rapids
that referenced
this pull request
Jun 9, 2021
Fix conflict 0.4 to 0.5
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.
fix #1821 auto-merge conflict
NOTE: this should be merged as a merge commit