You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2013/10/22 03:59:03 UTC
[1/2] git commit: Fix mesos urls
Updated Branches:
refs/heads/master aa61bfd39 -> 39d2e9b29
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 PR 71, this no longer occured.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/0071f089
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/0071f089
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/0071f089
Branch: refs/heads/master
Commit: 0071f0899c2931610823f16adcf1f71457edebcc
Parents: aa61bfd
Author: Aaron Davidson <aa...@databricks.com>
Authored: Mon Oct 21 15:53:28 2013 -0700
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Mon Oct 21 15:56:14 2013 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/0071f089/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index ebd2f46..564466c 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" =>
[2/2] git commit: Merge pull request #94 from aarondav/mesos-fix
Posted by ma...@apache.org.
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.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/39d2e9b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/39d2e9b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/39d2e9b2
Branch: refs/heads/master
Commit: 39d2e9b293768b6eeb291313ee94f3e02a0ad522
Parents: aa61bfd 0071f08
Author: Matei Zaharia <ma...@eecs.berkeley.edu>
Authored: Mon Oct 21 18:58:48 2013 -0700
Committer: Matei Zaharia <ma...@eecs.berkeley.edu>
Committed: Mon Oct 21 18:58:48 2013 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/SparkContext.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------