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/12/08 20:12:17 UTC

[1/3] git commit: Revert "[maven-release-plugin] prepare for next development iteration"

Updated Branches:
  refs/heads/branch-0.8 7f7ac64e2 -> 1bc7259f6


Revert "[maven-release-plugin] prepare for next development iteration"

This reverts commit 7f7ac64e2847b7cbdb9274fae75fed981601e7d7.


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

Branch: refs/heads/branch-0.8
Commit: 408f50bbbe0674126582edbc953313eb8c89d438
Parents: 7f7ac64
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Dec 8 11:11:45 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Dec 8 11:11:45 2013 -0800

----------------------------------------------------------------------
 assembly/pom.xml  | 2 +-
 bagel/pom.xml     | 2 +-
 core/pom.xml      | 2 +-
 examples/pom.xml  | 2 +-
 mllib/pom.xml     | 2 +-
 pom.xml           | 4 ++--
 repl-bin/pom.xml  | 2 +-
 repl/pom.xml      | 2 +-
 streaming/pom.xml | 2 +-
 tools/pom.xml     | 2 +-
 yarn/pom.xml      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 361a1d8..2789312 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/bagel/pom.xml
----------------------------------------------------------------------
diff --git a/bagel/pom.xml b/bagel/pom.xml
index 2be372d..8ec6acb 100644
--- a/bagel/pom.xml
+++ b/bagel/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 90ac301..dbef7ba 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index d12e3ab..bc9b792 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/mllib/pom.xml
----------------------------------------------------------------------
diff --git a/mllib/pom.xml b/mllib/pom.xml
index bd6a1c3..4e36d4c 100644
--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 53f576c..4abddcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   </parent>
   <groupId>org.apache.spark</groupId>
   <artifactId>spark-parent</artifactId>
-  <version>0.8.2-incubating-SNAPSHOT</version>
+  <version>0.8.1-incubating</version>
   <packaging>pom</packaging>
   <name>Spark Project Parent POM</name>
   <url>http://spark.incubator.apache.org/</url>
@@ -40,7 +40,7 @@
     <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>
-    <tag>HEAD</tag>
+    <tag>v0.8.1-incubating</tag>
   </scm>
   <developers>
     <developer>

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/repl-bin/pom.xml
----------------------------------------------------------------------
diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml
index 6f14fe8..dc4a21a 100644
--- a/repl-bin/pom.xml
+++ b/repl-bin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/repl/pom.xml
----------------------------------------------------------------------
diff --git a/repl/pom.xml b/repl/pom.xml
index 7a59d89..20c6b87 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/streaming/pom.xml
----------------------------------------------------------------------
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 9104016..834f155 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index 66e492e..c3bb294 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/408f50bb/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/pom.xml b/yarn/pom.xml
index 002c731..bcb8baf 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.2-incubating-SNAPSHOT</version>
+    <version>0.8.1-incubating</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 


[2/3] git commit: Revert "[maven-release-plugin] prepare release v0.8.1-incubating"

Posted by pw...@apache.org.
Revert "[maven-release-plugin] prepare release v0.8.1-incubating"

This reverts commit e88e6369d9ac55dff75c230ed5bc96c995b1d620.


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

Branch: refs/heads/branch-0.8
Commit: c7058d1086f64def8553dc836d990e1b85389d1b
Parents: 408f50b
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Dec 8 11:11:49 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Dec 8 11:11:49 2013 -0800

----------------------------------------------------------------------
 assembly/pom.xml  | 2 +-
 bagel/pom.xml     | 2 +-
 core/pom.xml      | 2 +-
 examples/pom.xml  | 2 +-
 mllib/pom.xml     | 2 +-
 pom.xml           | 4 ++--
 repl-bin/pom.xml  | 2 +-
 repl/pom.xml      | 2 +-
 streaming/pom.xml | 2 +-
 tools/pom.xml     | 2 +-
 yarn/pom.xml      | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 2789312..7e9b201 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/bagel/pom.xml
----------------------------------------------------------------------
diff --git a/bagel/pom.xml b/bagel/pom.xml
index 8ec6acb..44acbd9 100644
--- a/bagel/pom.xml
+++ b/bagel/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index dbef7ba..1264bc4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index bc9b792..2ef2785 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/mllib/pom.xml
----------------------------------------------------------------------
diff --git a/mllib/pom.xml b/mllib/pom.xml
index 4e36d4c..2a19d8b 100644
--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4abddcc..83f9b23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   </parent>
   <groupId>org.apache.spark</groupId>
   <artifactId>spark-parent</artifactId>
-  <version>0.8.1-incubating</version>
+  <version>0.8.1-incubating-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Spark Project Parent POM</name>
   <url>http://spark.incubator.apache.org/</url>
@@ -40,7 +40,7 @@
     <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>
-    <tag>v0.8.1-incubating</tag>
+    <tag>HEAD</tag>
   </scm>
   <developers>
     <developer>

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/repl-bin/pom.xml
----------------------------------------------------------------------
diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml
index dc4a21a..d0e4428 100644
--- a/repl-bin/pom.xml
+++ b/repl-bin/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/repl/pom.xml
----------------------------------------------------------------------
diff --git a/repl/pom.xml b/repl/pom.xml
index 20c6b87..86d2a0c 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/streaming/pom.xml
----------------------------------------------------------------------
diff --git a/streaming/pom.xml b/streaming/pom.xml
index 834f155..320d532 100644
--- a/streaming/pom.xml
+++ b/streaming/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index c3bb294..21a6ba9 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/c7058d10/yarn/pom.xml
----------------------------------------------------------------------
diff --git a/yarn/pom.xml b/yarn/pom.xml
index bcb8baf..d9168e3 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-    <version>0.8.1-incubating</version>
+    <version>0.8.1-incubating-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 


[3/3] git commit: Minor documentation fixes

Posted by pw...@apache.org.
Minor documentation fixes


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

Branch: refs/heads/branch-0.8
Commit: 1bc7259f61e93aa7d9d155864e331bad9e5d2f0d
Parents: c7058d1
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Dec 8 11:12:03 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Dec 8 11:12:03 2013 -0800

----------------------------------------------------------------------
 README.md                   | 8 +++-----
 docs/building-with-maven.md | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/1bc7259f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 37d9c0f..5e3a65f 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ versions without YARN, use:
     # Cloudera CDH 4.2.0 with MapReduce v1
     $ SPARK_HADOOP_VERSION=2.0.0-mr1-cdh4.2.0 sbt/sbt assembly
 
-For Apache Hadoop 2.0.X, 2.1.X, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions
+For Apache Hadoop 2.0.X, 2.1.X, 2.2.X, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions
 with YARN, also set `SPARK_YARN=true`:
 
     # Apache Hadoop 2.0.5-alpha
@@ -64,10 +64,8 @@ with YARN, also set `SPARK_YARN=true`:
     # Cloudera CDH 4.2.0 with MapReduce v2
     $ SPARK_HADOOP_VERSION=2.0.0-cdh4.2.0 SPARK_YARN=true sbt/sbt assembly
 
-When building for Hadoop 2.2.X and newer, you'll need to include the additional `new-yarn` profile:
-
-    # Apache Hadoop 2.2.X and newer
-    $ mvn -Dyarn.version=2.2.0 -Dhadoop.version=2.2.0 -Pnew-yarn
+    # Apache Hadoop 2.2.0 with YARN
+    $ SPARK_HADOOP_VERSION=2.2.0 SPARK_YARN=true sbt/sbt assembly
 
 For convenience, these variables may also be set through the `conf/spark-env.sh` file
 described below.

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/1bc7259f/docs/building-with-maven.md
----------------------------------------------------------------------
diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md
index c709001..b2744b0 100644
--- a/docs/building-with-maven.md
+++ b/docs/building-with-maven.md
@@ -48,7 +48,7 @@ For Apache Hadoop 2.x, 0.23.x, Cloudera CDH MRv2, and other Hadoop versions with
 Hadoop versions 2.2.x and newer can be built by setting the ```new-yarn``` and the ```yarn.version``` as follows:
  
     # Apache Hadoop 2.2.X and newer
-    $ mvn -Dyarn.version=2.2.0 -Dhadoop.version=2.2.0 -Pnew-yarn
+    $ mvn -Pnew-yarn -Dhadoop.version=2.2.0 -Dyarn.version=2.2.0 -DskipTests clean package
 
 The build process handles Hadoop 2.2.x as a special case that uses the directory ```new-yarn```, which supports the new YARN API. Furthermore, for this version, the build depends on artifacts published by the spark-project to enable Akka 2.0.5 to work with protobuf 2.5.