Repository: spark
Updated Branches:
  refs/heads/master 59a49db59 -> a7ed6f3cc


[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


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a7ed6f3c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a7ed6f3c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a7ed6f3c

Branch: refs/heads/master
Commit: a7ed6f3cc537f57de87d28e8466ca88fbfff53b5
Parents: 59a49db
Author: Ernest <[email protected]>
Authored: Thu Dec 18 15:42:26 2014 -0800
Committer: Reynold Xin <[email protected]>
Committed: Thu Dec 18 15:42:26 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/a7ed6f3c/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]

Reply via email to