spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [09/10] git commit: Merge branch 'master' into implicit-als
Date Wed, 09 Oct 2013 06:45:16 GMT
Merge branch 'master' into implicit-als


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/a5e58b8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/a5e58b8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/a5e58b8f

Branch: refs/heads/master
Commit: a5e58b8f980fe49d02dce83e366f0ea0cf070d76
Parents: b0f5f4d d585613
Author: Nick Pentreath <nick.pentreath@gmail.com>
Authored: Mon Oct 7 11:46:17 2013 +0200
Committer: Nick Pentreath <nick.pentreath@gmail.com>
Committed: Mon Oct 7 11:46:17 2013 +0200

----------------------------------------------------------------------
 assembly/pom.xml                                |  18 +--
 bagel/pom.xml                                   |   8 +-
 core/pom.xml                                    |  15 +-
 .../scala/org/apache/spark/CacheManager.scala   |   4 +-
 .../scala/org/apache/spark/SparkContext.scala   |  39 ++++--
 .../spark/api/python/PythonPartitioner.scala    |  10 +-
 .../org/apache/spark/api/python/PythonRDD.scala |   6 +-
 .../org/apache/spark/deploy/JsonProtocol.scala  |   3 +-
 .../apache/spark/deploy/SparkHadoopUtil.scala   |  12 +-
 .../scala/org/apache/spark/rdd/HadoopRDD.scala  | 140 ++++++++++++++++---
 .../scala/org/apache/spark/util/Utils.scala     |  13 ++
 .../spark/scheduler/SparkListenerSuite.scala    |   6 +-
 .../org/apache/spark/util/UtilsSuite.scala      |  11 ++
 docs/_layouts/global.html                       |   4 +-
 ec2/spark_ec2.py                                |   4 +-
 examples/pom.xml                                |  30 ++--
 mllib/pom.xml                                   |   8 +-
 pom.xml                                         |   7 +-
 python/pyspark/rdd.py                           |  10 +-
 python/pyspark/serializers.py                   |   4 +
 repl-bin/pom.xml                                |  10 +-
 repl/pom.xml                                    |  20 +--
 streaming/pom.xml                               |   9 +-
 tools/pom.xml                                   |   8 +-
 yarn/pom.xml                                    |   6 +-
 25 files changed, 293 insertions(+), 112 deletions(-)
----------------------------------------------------------------------



Mime
View raw message