Merge pull request #1 from aarondav/scala210-master Various merge corrections
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/f6b2e590 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/f6b2e590 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/f6b2e590 Branch: refs/heads/master Commit: f6b2e590b1ef35611f68c3ff7eb5c632d31a0dcc Parents: d4cd323 ce1d2af Author: Raymond Liu <[email protected]> Authored: Thu Nov 14 23:04:55 2013 -0800 Committer: Raymond Liu <[email protected]> Committed: Thu Nov 14 23:04:55 2013 -0800 ---------------------------------------------------------------------- .../spark/api/java/function/Function.java | 2 - .../spark/api/java/function/Function2.java | 2 - .../org/apache/spark/deploy/client/Client.scala | 4 +- .../spark/deploy/master/ApplicationState.scala | 3 +- .../org/apache/spark/deploy/master/Master.scala | 14 +---- .../org/apache/spark/deploy/worker/Worker.scala | 17 +----- .../executor/CoarseGrainedExecutorBackend.scala | 1 - .../org/apache/spark/executor/Executor.scala | 6 +- .../org/apache/spark/rdd/AsyncRDDActions.scala | 2 +- .../scala/org/apache/spark/rdd/BlockRDD.scala | 3 +- .../scala/org/apache/spark/rdd/HadoopRDD.scala | 2 +- .../apache/spark/scheduler/DAGScheduler.scala | 7 ++- .../scheduler/cluster/ClusterScheduler.scala | 2 +- .../mesos/CoarseMesosSchedulerBackend.scala | 1 + .../scala/org/apache/spark/util/Utils.scala | 5 +- .../spark/util/collection/OpenHashMap.scala | 1 - docs/hadoop-third-party-distributions.md | 4 +- project/SparkBuild.scala | 8 +-- .../org/apache/spark/repl/SparkILoop.scala | 14 +---- .../scala/org/apache/spark/repl/ReplSuite.scala | 2 +- .../spark/streaming/NetworkInputTracker.scala | 2 +- .../spark/streaming/PairDStreamFunctions.scala | 1 - .../streaming/api/java/JavaPairDStream.scala | 2 +- .../streaming/dstream/CoGroupedDStream.scala | 59 -------------------- .../streaming/dstream/KafkaInputDStream.scala | 1 - 25 files changed, 32 insertions(+), 133 deletions(-) ----------------------------------------------------------------------
