Skip to content

Conversation

@zsxwing
Copy link
Member

@zsxwing zsxwing commented May 31, 2016

What changes were proposed in this pull request?

This reverts commit c24b6b6. Sent a PR to run Jenkins tests due to the revert conflicts of dev/deps/spark-deps-hadoop*.

How was this patch tested?

Jenkins unit tests, integration tests, manual tests)

@srowen
Copy link
Member

srowen commented May 31, 2016

Let's instead downgrade to 2.6.5? Part of this change was to accomplish and update of the Jackson dependency

@zsxwing
Copy link
Member Author

zsxwing commented May 31, 2016

Let's instead downgrade to 2.6.5? Part of this change was to accomplish and update of the Jackson dependency

done

@srowen
Copy link
Member

srowen commented May 31, 2016

OK by me

@SparkQA
Copy link

SparkQA commented May 31, 2016

Test build #59669 has finished for PR 13417 at commit 5fc800d.

  • This patch fails PySpark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented May 31, 2016

Test build #59673 has finished for PR 13417 at commit 3c0828e.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@zsxwing
Copy link
Member Author

zsxwing commented May 31, 2016

Thanks. Merging to master and 2.0

@asfgit asfgit closed this in 9a74de1 May 31, 2016
asfgit pushed a commit that referenced this pull request May 31, 2016
…s option work

## What changes were proposed in this pull request?

This reverts commit c24b6b6. Sent a PR to run Jenkins tests due to the revert conflicts of `dev/deps/spark-deps-hadoop*`.

## How was this patch tested?

Jenkins unit tests, integration tests, manual tests)

Author: Shixiong Zhu <[email protected]>

Closes #13417 from zsxwing/revert-SPARK-11753.

(cherry picked from commit 9a74de1)
Signed-off-by: Shixiong Zhu <[email protected]>
@zsxwing zsxwing deleted the revert-SPARK-11753 branch May 31, 2016 21:54
@SparkQA
Copy link

SparkQA commented May 31, 2016

Test build #3032 has finished for PR 13417 at commit 3c0828e.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants