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 33C1B102C9 for ; Sat, 14 Dec 2013 08:45:41 +0000 (UTC) Received: (qmail 43562 invoked by uid 500); 14 Dec 2013 08:42:37 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 43466 invoked by uid 500); 14 Dec 2013 08:42:33 -0000 Mailing-List: contact commits-help@spark.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@spark.incubator.apache.org Delivered-To: mailing list commits@spark.incubator.apache.org Received: (qmail 43006 invoked by uid 99); 14 Dec 2013 08:42:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Dec 2013 08:42:19 +0000 X-ASF-Spam-Status: No, hits=-2000.1 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 14 Dec 2013 08:42:14 +0000 Received: (qmail 42416 invoked by uid 99); 14 Dec 2013 08:41:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Dec 2013 08:41:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 937B58B8E4A; Sat, 14 Dec 2013 08:41:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pwendell@apache.org To: commits@spark.incubator.apache.org Date: Sat, 14 Dec 2013 08:42:29 -0000 Message-Id: In-Reply-To: <708281e6fd3145bb8c835fdb7e9d73d0@git.apache.org> References: <708281e6fd3145bb8c835fdb7e9d73d0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [45/50] [abbrv] git commit: Merge pull request #260 from ScrapCodes/scala-2.10 X-Virus-Checked: Checked by ClamAV on apache.org Merge pull request #260 from ScrapCodes/scala-2.10 Review comments on the PR for scala 2.10 migration. Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/76566b1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/76566b1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/76566b1f Branch: refs/heads/master Commit: 76566b1fc97c487d0cd2176e9352ad07862a9025 Parents: 0aeb182 a854cc5 Author: Reynold Xin Authored: Fri Dec 13 10:11:02 2013 -0800 Committer: Reynold Xin Committed: Fri Dec 13 10:11:02 2013 -0800 ---------------------------------------------------------------------- .../scala/org/apache/spark/SparkContext.scala | 3 +-- .../org/apache/spark/api/java/JavaPairRDD.scala | 22 +++++++------------- .../org/apache/spark/api/java/JavaRDDLike.scala | 9 +++----- .../spark/api/java/JavaSparkContext.scala | 15 +++++-------- .../api/java/function/FlatMapFunction.scala | 2 +- .../org/apache/spark/api/python/PythonRDD.scala | 4 ++-- .../org/apache/spark/deploy/ExecutorState.scala | 3 +-- .../org/apache/spark/deploy/client/Client.scala | 2 +- .../org/apache/spark/rdd/CartesianRDD.scala | 2 +- .../scala/org/apache/spark/rdd/EmptyRDD.scala | 2 +- .../org/apache/spark/rdd/PairRDDFunctions.scala | 2 +- .../apache/spark/scheduler/TaskLocality.scala | 4 +--- .../org/apache/spark/storage/BlockManager.scala | 1 - project/SparkBuild.scala | 6 +++--- .../org/apache/spark/repl/SparkExprTyper.scala | 1 - 15 files changed, 29 insertions(+), 49 deletions(-) ----------------------------------------------------------------------