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 <[email protected]> Authored: Fri Dec 13 10:11:02 2013 -0800 Committer: Reynold Xin <[email protected]> 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(-) ----------------------------------------------------------------------
