aboutsummaryrefslogtreecommitdiff
path: root/bagel/src/main
diff options
context:
space:
mode:
authorPrashant Sharma <prashant.s@imaginea.com>2014-02-09 22:17:52 -0800
committerReynold Xin <rxin@apache.org>2014-02-09 22:17:52 -0800
commit919bd7f669c61500eee7231298d9880b320eb6f3 (patch)
tree5cdcf197aef425b6be47b676f8d7fe3d1e2e8c34 /bagel/src/main
parent2182aa3c55737a90e0ff200eede7146b440801a3 (diff)
downloadspark-919bd7f669c61500eee7231298d9880b320eb6f3.tar.gz
spark-919bd7f669c61500eee7231298d9880b320eb6f3.tar.bz2
spark-919bd7f669c61500eee7231298d9880b320eb6f3.zip
Merge pull request #567 from ScrapCodes/style2.
SPARK-1058, Fix Style Errors and Add Scala Style to Spark Build. Pt 2 Continuation of PR #557 With this all scala style errors are fixed across the code base !! The reason for creating a separate PR was to not interrupt an already reviewed and ready to merge PR. Hope this gets reviewed soon and merged too. Author: Prashant Sharma <prashant.s@imaginea.com> Closes #567 and squashes the following commits: 3b1ec30 [Prashant Sharma] scala style fixes
Diffstat (limited to 'bagel/src/main')
-rw-r--r--bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala b/bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala
index 281216612f..dd3eed8aff 100644
--- a/bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala
+++ b/bagel/src/main/scala/org/apache/spark/bagel/Bagel.scala
@@ -33,7 +33,8 @@ object Bagel extends Logging {
* @param messages initial set of messages represented as an RDD of (Key, Message) pairs. Often
* this will be an empty array, i.e. sc.parallelize(Array[K, Message]()).
* @param combiner [[org.apache.spark.bagel.Combiner]] combines multiple individual messages to a
- * given vertex into one message before sending (which often involves network I/O).
+ * given vertex into one message before sending (which often involves network
+ * I/O).
* @param aggregator [[org.apache.spark.bagel.Aggregator]] performs a reduce across all vertices
* after each superstep and provides the result to each vertex in the next
* superstep.