Fix auto-merge conflict 3167 [skip ci] #3169
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
* Update docs for 21.08 release Signed-off-by: Sameer Raheja <sraheja@nvidia.com> * Modify "or higher" -> "or later" when referring to versions Signed-off-by: Sameer Raheja <sraheja@nvidia.com> * Update docs/download.md Co-authored-by: Hao Zhu <9665750+viadea@users.noreply.github.com> * Move AQE for developers doc into development section of web site Signed-off-by: Sameer Raheja <sraheja@nvidia.com> * Add 21.06.1 release information to the download page Signed-off-by: Sameer Raheja <sraheja@nvidia.com> * Add information about kryoserialization buffer overflow Signed-off-by: Sameer Raheja <sraheja@nvidia.com> * Remove SNAPSHOT from getting-started-on-prem.md Signed-off-by: Sameer Raheja <sraheja@nvidia.com> * Update README.md for integration tests to remove SNAPSHOT Signed-off-by: Sameer Raheja <sraheja@nvidia.com> * Fix table in supported ops doc issue NVIDIA#2779 Signed-off-by: Sameer Raheja <sraheja@nvidia.com> * Fix typo (Abillity -> Ability) Signed-off-by: Sameer Raheja <sraheja@nvidia.com> Co-authored-by: Hao Zhu <9665750+viadea@users.noreply.github.com>
* update cudf Java binding version to 21.08.0 Signed-off-by: Peixin Li <pxli@nyu.edu> * update cudfjni version 21.08.2 * update env script for jenkins * update cudf doc from 21.08.0 to 21.08.2
Signed-off-by: Peixin Li <pxli@nyu.edu>
zhanga5
approved these changes
Aug 9, 2021
|
build |
pxLi
changed the title
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.
To fix merge conflict at #3167
NOTE: this must be merged as a merge conflict