Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch-21.06 into branch-21.08 #2565

Merged
merged 3 commits into from
Jun 2, 2021
Merged

Conversation

jlowe
Copy link
Member

@jlowe jlowe commented Jun 2, 2021

This resolves a merge conflict with branch-21.06. The merge conflict was the same as with #2561 except that PR was squashed instead of merged, so the merge conflict remained.

NOTE: This PR must be commited with a merge commit, not squashed!

NvTimLiu and others added 3 commits June 2, 2021 12:28
* Release profiling tool jar to maven central

Need to release profiling tool jar to maven central along with 21.06 rapids-plugin jars

Signed-off-by: Tim Liu <timl@nvidia.com>

* Add scala_binary version sufix to the profiling tool artifactID
* fixed indentation

Signed-off-by: Raza Jafri <rjafri@nvidia.com>

* Update shims/spark311/src/main/scala/com/nvidia/spark/rapids/shims/spark311/ParquetCachedBatchSerializer.scala

Co-authored-by: Jason Lowe <jlowe@nvidia.com>

Co-authored-by: Raza Jafri <rjafri@nvidia.com>
Co-authored-by: Jason Lowe <jlowe@nvidia.com>
@jlowe jlowe added the build Related to CI / CD or cleanly building label Jun 2, 2021
@jlowe jlowe self-assigned this Jun 2, 2021
@jlowe
Copy link
Member Author

jlowe commented Jun 2, 2021

build

@jlowe jlowe merged commit 0002306 into NVIDIA:branch-21.08 Jun 2, 2021
tgravescs pushed a commit that referenced this pull request Jun 9, 2021
Merge branch-21.06 into branch-21.08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants