diff options
| author | Aaron Davidson <aaron@databricks.com> | 2013-11-14 22:13:09 -0800 |
|---|---|---|
| committer | Aaron Davidson <aaron@databricks.com> | 2013-11-14 22:13:09 -0800 |
| commit | f629ba95b6a1a3508463bfdcb03efcfaa3327cb5 (patch) | |
| tree | 74a4cbcd839471d8c4248c9615f5803fad28787d /repl/src/test/scala/org | |
| parent | d4cd32330e1e4ac83b38bc922a9d3fd85f85f606 (diff) | |
| download | spark-f629ba95b6a1a3508463bfdcb03efcfaa3327cb5.tar.gz spark-f629ba95b6a1a3508463bfdcb03efcfaa3327cb5.tar.bz2 spark-f629ba95b6a1a3508463bfdcb03efcfaa3327cb5.zip | |
Various merge corrections
I've diff'd this patch against my own -- since they were both created
independently, this means that two sets of eyes have gone over all the
merge conflicts that were created, so I'm feeling significantly more
confident in the resulting PR.
@rxin has looked at the changes to the repl and is resoundingly
confident that they are correct.
Diffstat (limited to 'repl/src/test/scala/org')
| -rw-r--r-- | repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala b/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala index 418c31e24b..c230a03298 100644 --- a/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala +++ b/repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala @@ -78,7 +78,7 @@ class ReplSuite extends FunSuite { System.clearProperty("spark.hostPort") } - test ("simple foreach with accumulator") { + test("simple foreach with accumulator") { val output = runInterpreter("local", """ |val accum = sc.accumulator(0) |sc.parallelize(1 to 10).foreach(x => accum += x) |