You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/02 06:30:06 UTC
[28/33] git commit: Merge remote-tracking branch 'apache/master' into
conf2
Merge remote-tracking branch 'apache/master' into conf2
Conflicts:
project/SparkBuild.scala
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/0e5b2adb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/0e5b2adb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/0e5b2adb
Branch: refs/heads/master
Commit: 0e5b2adb5c4f2ab1bba275bb3cb2dc2643828f4f
Parents: 42bcfb2 9a0ff72
Author: Matei Zaharia <ma...@databricks.com>
Authored: Wed Jan 1 13:28:54 2014 -0500
Committer: Matei Zaharia <ma...@databricks.com>
Committed: Wed Jan 1 13:28:54 2014 -0500
----------------------------------------------------------------------
core/pom.xml | 422 ++++++++++---------
.../org/apache/spark/api/java/JavaPairRDD.scala | 36 ++
.../org/apache/spark/api/java/JavaRDDLike.scala | 11 +
.../org/apache/spark/rdd/PairRDDFunctions.scala | 42 ++
.../main/scala/org/apache/spark/rdd/RDD.scala | 16 +-
.../spark/util/SerializableHyperLogLog.scala | 50 +++
.../scala/org/apache/spark/JavaAPISuite.java | 32 ++
.../spark/rdd/PairRDDFunctionsSuite.scala | 34 ++
.../scala/org/apache/spark/rdd/RDDSuite.scala | 13 +
.../spark/serializer/KryoSerializerSuite.scala | 4 +
pom.xml | 5 +
project/SparkBuild.scala | 3 +-
12 files changed, 457 insertions(+), 211 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/0e5b2adb/core/src/main/scala/org/apache/spark/rdd/RDD.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/0e5b2adb/core/src/test/scala/org/apache/spark/serializer/KryoSerializerSuite.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/0e5b2adb/project/SparkBuild.scala
----------------------------------------------------------------------
diff --cc project/SparkBuild.scala
index 204662f,b3b5fc7..2eef2df
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@@ -248,7 -248,7 +248,8 @@@ object SparkBuild extends Build
"com.codahale.metrics" % "metrics-graphite" % "3.0.0",
"com.twitter" %% "chill" % "0.3.1",
"com.twitter" % "chill-java" % "0.3.1",
- "com.typesafe" % "config" % "1.0.2"
++ "com.typesafe" % "config" % "1.0.2",
+ "com.clearspring.analytics" % "stream" % "2.5.1"
)
)