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 merge conflict with branch-21.12 [databricks] #4268

Merged
merged 2 commits into from
Dec 2, 2021
Merged

Fix merge conflict with branch-21.12 [databricks] #4268

merged 2 commits into from
Dec 2, 2021

Conversation

jlowe
Copy link
Member

@jlowe jlowe commented Dec 2, 2021

Resolves the merge conflict reported in #4267. The conflict was due to file renames, and git was able to resolve the merge conflict automatically without intervention on my part.

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

jlowe added 2 commits December 2, 2021 08:54
@jlowe
Implement getShuffleRDD and fixup mismatched output types on shuffle …
bad9fee 
…reuse [databricks] (NVIDIA#4257)

* Implement getShuffleRDD and fixup mismatched output types on shuffle reuse

Signed-off-by: Jason Lowe <jlowe@nvidia.com>

* Fix Databricks 9.1 build
@jlowe
Merge branch 'branch-21.12' into fix-merge
62c075a
@jlowe jlowe added the build Related to CI / CD or cleanly building label Dec 2, 2021
@jlowe jlowe self-assigned this Dec 2, 2021
@jlowe
Copy link
Member Author

jlowe commented Dec 2, 2021

build

@jlowe
Copy link
Member Author

jlowe commented Dec 2, 2021

CI hit a weird error that seems unrelated:

[2021-12-02T15:45:44.141Z] ImportError while loading conftest '/home/jenkins/agent/workspace/jenkins-rapids_premerge-github-3422-ci-2/integration_tests/src/main/python/conftest.py'.
[2021-12-02T15:45:44.141Z] ../../src/main/python/conftest.py:17: in <module>
[2021-12-02T15:45:44.141Z]     from spark_init_internal import get_spark_i_know_what_i_am_doing
[2021-12-02T15:45:44.141Z] ../../src/main/python/spark_init_internal.py:21: in <module>
[2021-12-02T15:45:44.141Z]     findspark.init()
[2021-12-02T15:45:44.141Z] /usr/local/lib/python3.8/dist-packages/findspark.py:145: in init
[2021-12-02T15:45:44.141Z]     raise Exception(
[2021-12-02T15:45:44.141Z] E   Exception: Unable to find py4j, your SPARK_HOME may not be configured correctly
script returned exit code 4

@jlowe
Copy link
Member Author

jlowe commented Dec 2, 2021

build

@jlowe jlowe merged commit d1052c0 into NVIDIA:branch-22.02 Dec 2, 2021
@jlowe jlowe deleted the fix-merge branch December 2, 2021 20:03
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

@jlowe jlowe

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
@jlowe @tgravescs