Skip to content

Commit bee3cea

Browse files
rxinmarkhamstra
authored andcommitted
Revert "Merge pull request #94 from aarondav/mesos-fix"
This reverts commit fe974ba. The commit only applies to 0.9, not 0.8.x.
1 parent 0c4dc2a commit bee3cea

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

core/src/main/scala/org/apache/spark/SparkContext.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ class SparkContext(
156156
val LOCAL_CLUSTER_REGEX = """local-cluster\[\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*]""".r
157157
// Regular expression for connecting to Spark deploy clusters
158158
val SPARK_REGEX = """spark://(.*)""".r
159-
// Regular expression for connection to Mesos cluster
160-
val MESOS_REGEX = """mesos://(.*)""".r
159+
//Regular expression for connection to Mesos cluster
160+
val MESOS_REGEX = """(mesos://.*)""".r
161161

162162
master match {
163163
case "local" =>

0 commit comments

Comments
 (0)