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 2013/09/15 23:19:19 UTC
[01/10] git commit: Add git scm url for publishing
Updated Branches:
refs/heads/branch-0.8 891a3b71b -> a70b4fbd6
Add git scm url for publishing
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/45ec1cc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/45ec1cc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/45ec1cc9
Branch: refs/heads/branch-0.8
Commit: 45ec1cc90e25a82ffab587feeb419132efd1b9a1
Parents: a310de6
Author: Patrick Wendell <pw...@gmail.com>
Authored: Thu Sep 12 13:47:09 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Sep 12 13:47:31 2013 -0700
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/45ec1cc9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bb03a92..7bacbb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
</licenses>
<scm>
<connection>scm:git:git@github.com:apache/incubator-spark.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git</developerConnection>
<url>scm:git:git@github.com:apache/incubator-spark.git</url>
</scm>
<developers>
[02/10] git commit: Use different Hadoop version for YARN artifacts.
Posted by pw...@apache.org.
Use different Hadoop version for YARN artifacts.
This uses a seperate Hadoop version for YARN artifact. This means when people link against
spark-yarn, things will resolve correctly.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/e9eba8c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/e9eba8c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/e9eba8c3
Branch: refs/heads/branch-0.8
Commit: e9eba8c3ce320364f20dbbb19e42df07f936214f
Parents: 45ec1cc
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Sep 13 14:06:45 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Sep 13 15:34:57 2013 -0700
----------------------------------------------------------------------
pom.xml | 11 ++++++-----
yarn/pom.xml | 5 +++++
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e9eba8c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7bacbb1..2da016a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,6 +82,7 @@
<slf4j.version>1.7.2</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<hadoop.version>1.0.4</hadoop.version>
+ <yarn.version>0.23.7</yarn.version>
<hbase.version>0.94.6</hbase.version>
<PermGen>64m</PermGen>
@@ -382,7 +383,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId>
- <version>${hadoop.version}</version>
+ <version>${yarn.version}</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
@@ -413,7 +414,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
- <version>${hadoop.version}</version>
+ <version>${yarn.version}</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
@@ -444,7 +445,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
- <version>${hadoop.version}</version>
+ <version>${yarn.version}</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
@@ -700,8 +701,8 @@
<properties>
<hadoop.major.version>2</hadoop.major.version>
<!-- 0.23.* is same as 2.0.* - except hardened to run production jobs -->
- <!-- <hadoop.version>0.23.7</hadoop.version> -->
- <hadoop.version>2.0.5-alpha</hadoop.version>
+ <hadoop.version>0.23.7</hadoop.version>
+ <!--<hadoop.version>2.0.5-alpha</hadoop.version> -->
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/e9eba8c3/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/pom.xml b/yarn/pom.xml
index 27b2002..21b650d 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -49,6 +49,11 @@
<artifactId>hadoop-yarn-client</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${yarn.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
[07/10] git commit: Merge pull request #932 from
pwendell/mesos-version
Posted by pw...@apache.org.
Merge pull request #932 from pwendell/mesos-version
Bumping Mesos version to 0.13.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/dbd2c4fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/dbd2c4fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/dbd2c4fd
Branch: refs/heads/branch-0.8
Commit: dbd2c4fd948e09a1a270b576ad745d1065006acc
Parents: 9fb0b9d c856860
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Sep 15 13:20:41 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Sep 15 13:20:41 2013 -0700
----------------------------------------------------------------------
docs/_config.yml | 2 +-
pom.xml | 2 +-
project/SparkBuild.scala | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[10/10] git commit: Merge remote-tracking branch 'origin/master' into
branch-0.8
Posted by pw...@apache.org.
Merge remote-tracking branch 'origin/master' into branch-0.8
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/a70b4fbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/a70b4fbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/a70b4fbd
Branch: refs/heads/branch-0.8
Commit: a70b4fbd6c97358761b8f6a0d56bf216e3e99068
Parents: 891a3b7 2aff798
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Sep 15 14:17:40 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Sep 15 14:17:40 2013 -0700
----------------------------------------------------------------------
docs/_config.yml | 2 +-
docs/building-with-maven.md | 6 +++---
pom.xml | 2 +-
project/SparkBuild.scala | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/a70b4fbd/docs/_config.yml
----------------------------------------------------------------------
diff --cc docs/_config.yml
index e35d7bc,b061764..2c35d5c
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@@ -3,8 -3,8 +3,8 @@@ markdown: kramdow
# These allow the documentation to be updated with nerw releases
# of Spark, Scala, and Mesos.
-SPARK_VERSION: 0.8.0-SNAPSHOT
+SPARK_VERSION: 0.8.0-incubating
SPARK_VERSION_SHORT: 0.8.0
SCALA_VERSION: 2.9.3
- MESOS_VERSION: 0.9.0-incubating
+ MESOS_VERSION: 0.13.0
SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/a70b4fbd/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/a70b4fbd/project/SparkBuild.scala
----------------------------------------------------------------------
[06/10] git commit: Merge pull request #931 from pwendell/yarn-docs
Posted by pw...@apache.org.
Merge pull request #931 from pwendell/yarn-docs
Explain yarn.version in Maven build docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/9fb0b9d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/9fb0b9d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/9fb0b9d7
Branch: refs/heads/branch-0.8
Commit: 9fb0b9d77fd383ad2cdd600edcc77c7b43c5e1c2
Parents: c4c1db2 362ea0c
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Sep 15 13:02:53 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Sep 15 13:02:53 2013 -0700
----------------------------------------------------------------------
docs/building-with-maven.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[03/10] git commit: Merge pull request #929 from pwendell/master
Posted by pw...@apache.org.
Merge pull request #929 from pwendell/master
Use different Hadoop version for YARN artifacts.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c4c1db2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c4c1db2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c4c1db2d
Branch: refs/heads/branch-0.8
Commit: c4c1db2dd5b2ec0a8182369ecdb0e14f4e199822
Parents: 45ec1cc e9eba8c
Author: Patrick Wendell <pw...@gmail.com>
Authored: Fri Sep 13 19:52:12 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Fri Sep 13 19:52:12 2013 -0700
----------------------------------------------------------------------
pom.xml | 11 ++++++-----
yarn/pom.xml | 5 +++++
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[08/10] git commit: Fix typo in Maven build docs
Posted by pw...@apache.org.
Fix typo in Maven build docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/ac0dd993
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/ac0dd993
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/ac0dd993
Branch: refs/heads/branch-0.8
Commit: ac0dd99394faf9e0389d5a1340b729c02a55c363
Parents: dbd2c4f
Author: Jey Kottalam <je...@cs.berkeley.edu>
Authored: Sun Sep 15 13:29:22 2013 -0700
Committer: Jey Kottalam <je...@cs.berkeley.edu>
Committed: Sun Sep 15 13:29:22 2013 -0700
----------------------------------------------------------------------
docs/building-with-maven.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/ac0dd993/docs/building-with-maven.md
----------------------------------------------------------------------
diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md
index 3065427..19c01e1 100644
--- a/docs/building-with-maven.md
+++ b/docs/building-with-maven.md
@@ -40,10 +40,10 @@ For Apache Hadoop versions 1.x, Cloudera CDH MRv1, and other Hadoop versions wit
For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should enable the "hadoop2-yarn" profile and set the "yarn.version" property:
# Apache Hadoop 2.0.5-alpha
- $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.5-alpha -Pyarn.version=2.0.5-alpha -DskipTests clean package
+ $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.5-alpha -Dyarn.version=2.0.5-alpha -DskipTests clean package
# Cloudera CDH 4.2.0 with MapReduce v2
- $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -Pyarn.version=2.0.0-chd4.2.0 -DskipTests clean package
+ $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -Dyarn.version=2.0.0-chd4.2.0 -DskipTests clean package
## Spark Tests in Maven ##
[05/10] git commit: Bumping Mesos version to 0.13.0
Posted by pw...@apache.org.
Bumping Mesos version to 0.13.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/c856860c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/c856860c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/c856860c
Branch: refs/heads/branch-0.8
Commit: c856860c5b4b0e3ef6f8e23d72d1d0069e3a56bf
Parents: e9eba8c
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Sep 15 12:46:26 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Sep 15 12:46:26 2013 -0700
----------------------------------------------------------------------
docs/_config.yml | 2 +-
pom.xml | 2 +-
project/SparkBuild.scala | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c856860c/docs/_config.yml
----------------------------------------------------------------------
diff --git a/docs/_config.yml b/docs/_config.yml
index 5c135a0..b061764 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -6,5 +6,5 @@ markdown: kramdown
SPARK_VERSION: 0.8.0-SNAPSHOT
SPARK_VERSION_SHORT: 0.8.0
SCALA_VERSION: 2.9.3
-MESOS_VERSION: 0.9.0-incubating
+MESOS_VERSION: 0.13.0
SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c856860c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2da016a..4aed126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
<java.version>1.5</java.version>
<scala.version>2.9.3</scala.version>
- <mesos.version>0.12.1</mesos.version>
+ <mesos.version>0.13.0</mesos.version>
<akka.version>2.0.5</akka.version>
<slf4j.version>1.7.2</slf4j.version>
<log4j.version>1.2.17</log4j.version>
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c856860c/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 77e211c..ed76717 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -204,7 +204,7 @@ object SparkBuild extends Build {
"it.unimi.dsi" % "fastutil" % "6.4.4",
"colt" % "colt" % "1.2.0",
"net.liftweb" % "lift-json_2.9.2" % "2.5",
- "org.apache.mesos" % "mesos" % "0.12.1",
+ "org.apache.mesos" % "mesos" % "0.13.0",
"io.netty" % "netty-all" % "4.0.0.Beta2",
"org.apache.derby" % "derby" % "10.4.2.0" % "test",
"org.apache.hadoop" % "hadoop-client" % hadoopVersion excludeAll(excludeJackson, excludeNetty, excludeAsm),
[09/10] git commit: Merge pull request #933 from jey/yarn-typo-fix
Posted by pw...@apache.org.
Merge pull request #933 from jey/yarn-typo-fix
Fix typo in Maven build docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/2aff7989
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/2aff7989
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/2aff7989
Branch: refs/heads/branch-0.8
Commit: 2aff7989ab617f33052098498119886c40794774
Parents: dbd2c4f ac0dd99
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Sep 15 14:05:04 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Sep 15 14:05:04 2013 -0700
----------------------------------------------------------------------
docs/building-with-maven.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[04/10] git commit: Explain yarn.version in Maven build docs
Posted by pw...@apache.org.
Explain yarn.version in Maven build docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/362ea0c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/362ea0c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/362ea0c0
Branch: refs/heads/branch-0.8
Commit: 362ea0c0517ca0caaf5d3c12f8187198be59ca37
Parents: e9eba8c
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Sep 15 12:36:58 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Sep 15 12:40:49 2013 -0700
----------------------------------------------------------------------
docs/building-with-maven.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/362ea0c0/docs/building-with-maven.md
----------------------------------------------------------------------
diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md
index 7ecb601..3065427 100644
--- a/docs/building-with-maven.md
+++ b/docs/building-with-maven.md
@@ -37,13 +37,13 @@ For Apache Hadoop versions 1.x, Cloudera CDH MRv1, and other Hadoop versions wit
# Cloudera CDH 4.2.0 with MapReduce v1
$ mvn -Dhadoop.version=2.0.0-mr1-cdh4.2.0 -DskipTests clean package
-For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should also enable the "hadoop2-yarn" profile:
+For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with YARN, you should enable the "hadoop2-yarn" profile and set the "yarn.version" property:
# Apache Hadoop 2.0.5-alpha
- $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.5-alpha -DskipTests clean package
+ $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.5-alpha -Pyarn.version=2.0.5-alpha -DskipTests clean package
# Cloudera CDH 4.2.0 with MapReduce v2
- $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -DskipTests clean package
+ $ mvn -Phadoop2-yarn -Dhadoop.version=2.0.0-cdh4.2.0 -Pyarn.version=2.0.0-chd4.2.0 -DskipTests clean package
## Spark Tests in Maven ##