From 886183e5910cfc6df5f88317fafb5f68dabd5bd6 Mon Sep 17 00:00:00 2001 From: Denny Date: Wed, 5 Sep 2012 17:10:54 -0700 Subject: [PATCH] Renamed spark-cluster to spark-local. --- core/src/main/scala/spark/SparkContext.scala | 2 +- 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 = {