Fix merge conflict with branch-0.4 #1937
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
Signed-off-by: Sameer Raheja <sraheja@nvidia.com>
|
build |
revans2
previously approved these changes
Mar 15, 2021
* Change cudf dependency to 0.18.1 Signed-off-by: Tim Liu <timl@nvidia.com> * Revert RapidsConf.scala, will update it in another PR along with the docs
* First step restrict hash shuffle support Signed-off-by: Robert (Bobby) Evans <bobby@apache.org> * Pulled in join tests * Added in exct partitioning tests * all the things * Decimal works * Cleanup * Addressed review comments * Fix failing tests because of spark changes * Add back in failing test
Signed-off-by: Peixin Li <pxli@nyu.edu>
|
#1936 got more commits merged, |
|
Yes, I'll update this with the new commits |
revans2
approved these changes
Mar 16, 2021
|
build |
1 similar comment
|
build |
nartal1
pushed a commit
to nartal1/spark-rapids
that referenced
this pull request
Jun 9, 2021
Fix merge conflict with branch-0.4
nartal1
pushed a commit
to nartal1/spark-rapids
that referenced
this pull request
Jun 9, 2021
Fix merge conflict with branch-0.4
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.
Fixes the merge conflict flagged by #1936. All the conflicts were with documentation or doc strings in code. All conflicts were dropped in favor of the existing branch-0.5 version except for
download.mdwhere the change needed to be migrated to the new layout in that document.NOTE: This needs to be committed with a merge commit, not squashed!