diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-21 18:58:48 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-21 18:58:48 -0700 |
| commit | 39d2e9b293768b6eeb291313ee94f3e02a0ad522 (patch) | |
| tree | 7a9ff6c373e91c9532d24b0746437de204515bd9 | |
| parent | aa61bfd39962a3e3c8ba8e4bcf25f48212933cce (diff) | |
| parent | 0071f0899c2931610823f16adcf1f71457edebcc (diff) | |
| download | spark-39d2e9b293768b6eeb291313ee94f3e02a0ad522.tar.gz spark-39d2e9b293768b6eeb291313ee94f3e02a0ad522.tar.bz2 spark-39d2e9b293768b6eeb291313ee94f3e02a0ad522.zip | |
Merge pull request #94 from aarondav/mesos-fix
Fix mesos urls
This was a bug I introduced in https://github.com/apache/incubator-spark/pull/71.
Previously, we explicitly removed the mesos:// part; with #71, this no longer occurs.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkContext.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index ebd2f46173..564466cfd5 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -156,8 +156,8 @@ class SparkContext( val LOCAL_CLUSTER_REGEX = """local-cluster\[\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*]""".r // Regular expression for connecting to Spark deploy clusters val SPARK_REGEX = """spark://(.*)""".r - //Regular expression for connection to Mesos cluster - val MESOS_REGEX = """(mesos://.*)""".r + // Regular expression for connection to Mesos cluster + val MESOS_REGEX = """mesos://(.*)""".r master match { case "local" => |