Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BEA510C39 for ; Thu, 18 Dec 2014 23:43:13 +0000 (UTC) Received: (qmail 1011 invoked by uid 500); 18 Dec 2014 23:43:13 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 980 invoked by uid 500); 18 Dec 2014 23:43:13 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 971 invoked by uid 99); 18 Dec 2014 23:43:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2014 23:43:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 232549CAE4D; Thu, 18 Dec 2014 23:43:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rxin@apache.org To: commits@spark.apache.org Message-Id: <3fad6f8979df4db5beb00a8d08a61359@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-4880] remove spark.locality.wait in Analytics Date: Thu, 18 Dec 2014 23:43:13 +0000 (UTC) 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 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 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 Authored: Thu Dec 18 15:42:26 2014 -0800 Committer: Reynold Xin 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: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org