Merge branch 'master' of github.com:apache/incubator-spark into scala-2.10
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/026ab756 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/026ab756 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/026ab756 Branch: refs/heads/scala-2.10 Commit: 026ab7566167e6c8ab1b0cce75b9e09bbd485bee Parents: 2686063 320418f Author: Prashant Sharma <prashan...@imaginea.com> Authored: Thu Oct 10 09:42:55 2013 +0530 Committer: Prashant Sharma <prashan...@imaginea.com> Committed: Thu Oct 10 09:42:55 2013 +0530 ---------------------------------------------------------------------- .../scala/org/apache/spark/SparkContext.scala | 2 +- .../spark/deploy/master/ApplicationSource.scala | 2 +- .../spark/deploy/master/MasterSource.scala | 6 +- .../spark/deploy/worker/WorkerSource.scala | 10 +- .../apache/spark/executor/ExecutorSource.scala | 18 +- .../apache/spark/scheduler/DAGScheduler.scala | 2 +- .../spark/scheduler/DAGSchedulerSource.scala | 10 +- .../spark/scheduler/SparkListenerBus.scala | 18 ++ .../spark/serializer/KryoSerializer.scala | 22 +- .../spark/storage/BlockManagerSource.scala | 8 +- .../spark/scheduler/SparkListenerSuite.scala | 32 +-- .../spark/serializer/KryoSerializerSuite.scala | 21 ++ docs/mllib-guide.md | 24 ++- docs/python-programming-guide.md | 2 +- .../apache/spark/mllib/recommendation/ALS.scala | 199 ++++++++++++++++--- .../mllib/recommendation/JavaALSSuite.java | 85 ++++++-- .../spark/mllib/recommendation/ALSSuite.scala | 75 +++++-- python/pyspark/rdd.py | 60 +++++- 18 files changed, 474 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/026ab756/core/src/main/scala/org/apache/spark/SparkContext.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/026ab756/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/026ab756/mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java ---------------------------------------------------------------------- diff --cc mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java index c474e01,eafee06..b40f552 --- a/mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java +++ b/mllib/src/test/java/org/apache/spark/mllib/recommendation/JavaALSSuite.java @@@ -19,7 -19,10 +19,8 @@@ package org.apache.spark.mllib.recommen import java.io.Serializable; import java.util.List; + import java.lang.Math; -import scala.Tuple2; - import org.junit.After; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/026ab756/python/pyspark/rdd.py ----------------------------------------------------------------------
