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.

Sign up for GitHub

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

Jump to bottom

Fix auto merge conflict 5752 #5754

Merged
merged 2 commits into from
Jun 6, 2022
Merged

Fix auto merge conflict 5752 #5754

merged 2 commits into from
Jun 6, 2022

Conversation

nartal1
Copy link
Collaborator

@nartal1 nartal1 commented Jun 6, 2022 •
edited
Loading

Merge commit was due to plugin version in RapidsConf. Closes #5752

spark2-sql-plugin/src/main/scala/com/nvidia/spark/rapids/RapidsConf.scala

|$SPARK_HOME/bin/spark --jars 'rapids-4-spark_2.12-22.08.0-SNAPSHOT.jar,cudf-22.08.0-SNAPSHOT-cuda11.jar' \
=======
|$SPARK_HOME/bin/spark --jars rapids-4-spark_2.12-22.06.0-SNAPSHOT-cuda11.jar \

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

tgravescs and others added 2 commits June 6, 2022 12:51
@tgravescs
Update Spark2 explain code for 22.06 (NVIDIA#5738)
3d8cbf3 
* Update some of the spark2 expalin APi to the newest 22.06

Signed-off-by: Thomas Graves <tgraves@nvidia.com>

* Update diffs scripts

* add in new files to diff

* fix file name
@nartal1
Merge branch-22.06 into branch-22.08
5932090
@nartal1 nartal1 added the build Related to CI / CD or cleanly building label Jun 6, 2022
@nartal1 nartal1 self-assigned this Jun 6, 2022
@nartal1
Copy link
Collaborator Author

nartal1 commented Jun 6, 2022

build

tgravescs
tgravescs approved these changes Jun 6, 2022
View reviewed changes
Copy link
Collaborator

@tgravescs tgravescs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok for now we will need to update for 22.08 diffs

@tgravescs tgravescs merged commit 2243a83 into NVIDIA:branch-22.08 Jun 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tgravescs tgravescs tgravescs approved these changes

Assignees

@nartal1 nartal1

Labels
build Related to CI / CD or cleanly building
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nartal1 @tgravescs