[4/4] git commit: Merge pull request #217 from aarondav/mesos-urls

[rx...@apache.org]

Merge pull request #217 from aarondav/mesos-urls

Re-enable zk:// urls for Mesos SparkContexts

This was broken in PR #71 when we explicitly disallow anything that didn't fit a mesos:// url.
Although it is not really clear that a zk:// url should match Mesos, it is what the docs say and it is necessary for backwards compatibility.

Additionally added a unit test for the creation of all types of TaskSchedulers. Since YARN and Mesos are not necessarily available in the system, they are allowed to pass as long as the YARN/Mesos code paths are exercised.


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/58d9bbcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/58d9bbcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/58d9bbcf

Branch: refs/heads/master
Commit: 58d9bbcfecb2746cae4d3b53fc3a33a0d5e48d6b
Parents: 740922f 96df26b
Author: Reynold Xin <rx...@apache.org>
Authored: Mon Dec 2 21:58:53 2013 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Mon Dec 2 21:58:53 2013 -0800

----------------------------------------------------------------------
 .../scala/org/apache/spark/SparkContext.scala   | 233 ++++++++++---------
 .../spark/scheduler/local/LocalScheduler.scala  |   2 +-
 .../SparkContextSchedulerCreationSuite.scala    | 140 +++++++++++
 3 files changed, 260 insertions(+), 115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/58d9bbcf/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------