Fix merge conflict with branch-0.4 #1848
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
* Spark 3.1.1 shim no longer a snapshot shim Signed-off-by: Jason Lowe <jlowe@nvidia.com> * Remove 3.1.0, 3.1.0-SNAPSHOT, and 3.1.1-SNAPSHOT support * Remove obsolete comment
* Update to note support for 3.0.2 Signed-off-by: Sameer Raheja <sraheja@nvidia.com> * Update FAQ to reflect 3.0.2 and 3.1.1 support Signed-off-by: Sameer Raheja <sraheja@nvidia.com>
jlowe
requested review from
GaryShen2008,
NvTimLiu,
revans2 and
tgravescs
as code owners
|
build |
Port apache/spark#31320 to close NVIDIA#1735 Signed-off-by: Gera Shegalov <gera@apache.org>
|
build |
revans2
approved these changes
Mar 2, 2021
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.
This fixes the merge conflict flagged in #1847. The pom files conflicted with the Spark 320 shim added in #1704.
NOTE: This must be merged with a merge commit, not squashed!