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

[SPARK-9352] [SPARK-9353] [HOTFIX] Reverts PR #7668 on branch-1.4 #7686

Closed
wants to merge 2 commits into from

Conversation

liancheng
Copy link
Contributor

MasterSuite.makeMaster() doesn't compile under 1.4. Master is still an actor in branch-1.4, and can only be created via ActorSystem.actorOf, or with TestActorRef.

@liancheng
Copy link
Contributor Author

cc @andrewor14

@liancheng
Copy link
Contributor Author

I'm merging this to branch-1.4 to bring Jenkins 1.4 builders back.

@liancheng liancheng changed the title [HOTFIX] Reverts PR #7668 on branch-1.4 [SPARK-9352] [SPARK-9353] [HOTFIX] Reverts PR #7668 on branch-1.4 Jul 27, 2015
asfgit pushed a commit that referenced this pull request Jul 27, 2015
`MasterSuite.makeMaster()` doesn't compile under 1.4. `Master` is still an actor in branch-1.4, and can only be created via `ActorSystem.actorOf`, or with `TestActorRef`.

Author: Cheng Lian <lian@databricks.com>

Closes #7686 from liancheng/hotfix-revert-pr-7668 and squashes the following commits:

089a1a8 [Cheng Lian] Revert "[SPARK-9352] [SPARK-9353] Add tests for standalone scheduling code"
54e8ab0 [Cheng Lian] Revert "[HOTFIX] Fix compile in MasterSuite"
@andrewor14
Copy link
Contributor

Thanks @liancheng for fixing this. I'll do a more careful job back porting next time.

@andrewor14
Copy link
Contributor

(could you close this since it's already merged?)

@liancheng liancheng closed this Jul 27, 2015
@liancheng liancheng deleted the hotfix-revert-pr-7668 branch July 27, 2015 07:20
@SparkQA
Copy link

SparkQA commented Jul 27, 2015

Test build #38510 has finished for PR 7686 at commit 089a1a8.

  • 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
3 participants