Repository: spark Updated Branches: refs/heads/branch-1.2 ef5c23626 -> e7f9dd5cd
[SPARK-4880] remove spark.locality.wait in Analytics spark.locality.wait set to 100000 in examples/graphx/Analytics.scala. Should be left to the user. Author: Ernest <[email protected]> Closes #3730 from Earne/SPARK-4880 and squashes the following commits: d79ed04 [Ernest] remove spark.locality.wait in Analytics (cherry picked from commit a7ed6f3cc537f57de87d28e8466ca88fbfff53b5) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e7f9dd5c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e7f9dd5c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e7f9dd5c Branch: refs/heads/branch-1.2 Commit: e7f9dd5cd10d18d0b712916750ac1643df169b4f Parents: ef5c236 Author: Ernest <[email protected]> Authored: Thu Dec 18 15:42:26 2014 -0800 Committer: Reynold Xin <[email protected]> Committed: Thu Dec 18 15:42:37 2014 -0800 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/examples/graphx/Analytics.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e7f9dd5c/examples/src/main/scala/org/apache/spark/examples/graphx/Analytics.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/spark/examples/graphx/Analytics.scala b/examples/src/main/scala/org/apache/spark/examples/graphx/Analytics.scala index 828cffb..9cc4732 100644 --- a/examples/src/main/scala/org/apache/spark/examples/graphx/Analytics.scala +++ b/examples/src/main/scala/org/apache/spark/examples/graphx/Analytics.scala @@ -46,7 +46,7 @@ object Analytics extends Logging { } val options = mutable.Map(optionsList: _*) - val conf = new SparkConf().set("spark.locality.wait", "100000") + val conf = new SparkConf() GraphXUtils.registerKryoClasses(conf) val numEPart = options.remove("numEPart").map(_.toInt).getOrElse { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
