diff options
| author | Denny <dennybritz@gmail.com> | 2012-09-05 17:10:54 -0700 |
|---|---|---|
| committer | Denny <dennybritz@gmail.com> | 2012-09-10 12:48:58 -0700 |
| commit | 8bb3c739774e3ab79588a83aad6d2cf0f2e12857 (patch) | |
| tree | 1d20b0c457435817470bbb68f318b2f3e4a0f7cc | |
| parent | a367c20f4907dddecda64a3f1d67171556fa6ba0 (diff) | |
| download | spark-8bb3c739774e3ab79588a83aad6d2cf0f2e12857.tar.gz spark-8bb3c739774e3ab79588a83aad6d2cf0f2e12857.tar.bz2 spark-8bb3c739774e3ab79588a83aad6d2cf0f2e12857.zip | |
Renamed spark-cluster to spark-local.
| -rw-r--r-- | core/src/main/scala/spark/SparkContext.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/deploy/LocalSparkCluster.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/SparkContext.scala b/core/src/main/scala/spark/SparkContext.scala index e24f4be5a4..a3a1000d30 100644 --- a/core/src/main/scala/spark/SparkContext.scala +++ b/core/src/main/scala/spark/SparkContext.scala @@ -84,7 +84,7 @@ class SparkContext( // Regular expression for local[N, maxRetries], used in tests with failing tasks val LOCAL_N_FAILURES_REGEX = """local\[([0-9]+),([0-9]+)\]""".r // Regular expression for simulating a Spark cluster of [N, cores, memory] locally - val SPARK_LOCALCLUSTER_REGEX = """spark-cluster\[([0-9]+)\,([0-9]+),([0-9]+)]""".r + val SPARK_LOCALCLUSTER_REGEX = """local-cluster\[([0-9]+)\,([0-9]+),([0-9]+)]""".r // Regular expression for connecting to Spark deploy clusters val SPARK_REGEX = """(spark://.*)""".r diff --git a/core/src/main/scala/spark/deploy/LocalSparkCluster.scala b/core/src/main/scala/spark/deploy/LocalSparkCluster.scala index 4f37cd5f83..5c535ed502 100644 --- a/core/src/main/scala/spark/deploy/LocalSparkCluster.scala +++ b/core/src/main/scala/spark/deploy/LocalSparkCluster.scala @@ -19,7 +19,7 @@ class LocalSparkCluster(numSlaves : Int, coresPerSlave : Int, var masterPort : Int = _ var masterUrl : String = _ - val slaveActors = ArrayBuffer[ActorRef]() + val slaveActors = ArrayBuffer[ActorRef]() def start() : String = { |