aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrashant Sharma <prashant.s@imaginea.com>2014-01-07 13:08:16 +0530
committerPrashant Sharma <prashant.s@imaginea.com>2014-01-07 13:08:16 +0530
commitc729fa7c8ed733a778a7201ed17bf74f3e132845 (patch)
treec8f621c2a18479faacbdf03aafd2831716908a84
parentb84dc780d3ad3fc2f0f1e9ba3fd1676447c65e96 (diff)
downloadspark-c729fa7c8ed733a778a7201ed17bf74f3e132845.tar.gz
spark-c729fa7c8ed733a778a7201ed17bf74f3e132845.tar.bz2
spark-c729fa7c8ed733a778a7201ed17bf74f3e132845.zip
formatting related fixes suggested by Patrick.
-rw-r--r--core/src/main/scala/org/apache/spark/SparkConf.scala6
-rw-r--r--docs/configuration.md2
2 files changed, 2 insertions, 6 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala
index 2d437f1b21..b166527614 100644
--- a/core/src/main/scala/org/apache/spark/SparkConf.scala
+++ b/core/src/main/scala/org/apache/spark/SparkConf.scala
@@ -173,11 +173,7 @@ class SparkConf(loadDefaults: Boolean) extends Serializable with Cloneable with
}
/** Get all akka conf variables set on this SparkConf */
- def getAkkaConf: Seq[(String, String)] = {
- getAll.filter {
- case (k, v) => k.startsWith("akka.")
- }
- }
+ def getAkkaConf: Seq[(String, String)] = getAll.filter {case (k, v) => k.startsWith("akka.")}
/** Does the configuration contain a given parameter? */
def contains(key: String): Boolean = settings.contains(key)
diff --git a/docs/configuration.md b/docs/configuration.md
index f00fe05476..1d36ecb9c1 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -364,7 +364,7 @@ Apart from these, the following properties are also available, and may be useful
<td>akka.x.y....</td>
<td>value</td>
<td>
- An arbitrary akka configuration can be set directly on spark conf and it is applied for all the ActorSystems created spark wide for that spark context and its assigned executors as well.
+ An arbitrary akka configuration can be set directly on spark conf and it is applied for all the ActorSystems created spark wide for that SparkContext and its assigned executors as well.
</td>
</tr>