Fix merge from 22.04 to 22.06 #5070
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
* Add getOrcSchemaString for OrcShims Signed-off-by: Bobby Wang <wbo4958@gmail.com>
|
build |
tgravescs
previously approved these changes
Mar 28, 2022
* Updated spark2 for changes in 22.04 * More Spark2 updates * Document EqualNullSafe example in spark 2.x explain api docs * remove TODO * Sign off Signed-off-by: Thomas Graves <tgraves@nvidia.com>
|
build |
|
sorry should have waited to merge the 2.x stuff |
tgravescs
approved these changes
Mar 28, 2022
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 from #5068. The merge conflict was with imports in GpuOrcScan.
NOTE: This must be merged with a merge commit, not squashed!