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/09 06:37:13 UTC

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

Updated Branches:
  refs/heads/branch-0.8 4c555328d -> 5ab8e0408


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

This reverts commit 4c555328dd782efc2ab97ae35ea2f3a5b00cb450.


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

Branch: refs/heads/branch-0.8
Commit: 7a72b6084e3f011755ebaa29e78dd3ea52794105
Parents: 4c55532
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Dec 8 21:36:27 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Dec 8 21:36:27 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/7a72b608/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/7a72b608/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/7a72b608/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/7a72b608/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/7a72b608/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/7a72b608/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/7a72b608/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/7a72b608/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/7a72b608/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/7a72b608/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/7a72b608/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/4] 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 00d5c734dd4b12e128295518e4bd620fdb13bed7.


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

Branch: refs/heads/branch-0.8
Commit: fde53474386a3679603e8020e825e6e61289511b
Parents: 7a72b60
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Dec 8 21:36:30 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Dec 8 21:36:30 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/fde53474/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/fde53474/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/fde53474/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/fde53474/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/fde53474/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/fde53474/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/fde53474/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/fde53474/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/fde53474/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/fde53474/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/fde53474/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>
 


[4/4] git commit: Updating CHANGES file

Posted by pw...@apache.org.
Updating CHANGES file


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

Branch: refs/heads/branch-0.8
Commit: 5ab8e0408886b4176d53659c1fc8bbbcdeec13fc
Parents: 4b2769b
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Dec 8 21:34:53 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Dec 8 21:36:53 2013 -0800

----------------------------------------------------------------------
 CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/5ab8e040/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0ab59f3..ce0aeab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,10 @@ Spark Change Log
 
 Release 0.8.1-incubating
 
+  3e1f78c Sun Dec 8 21:34:12 2013 -0800
+  Merge pull request #195 from dhardy92/fix_DebScriptPackage
+  [[Deb] fix package of Spark classes adding org.apache prefix in scripts embeded in .deb]
+
   c14f373 Sat Dec 7 22:35:31 2013 -0800
   Merge pull request #241 from pwendell/master
   [Update broken links and add HDP 2.0 version string]


[3/4] git commit: Merge pull request #195 from dhardy92/fix_DebScriptPackage

Posted by pw...@apache.org.
Merge pull request #195 from dhardy92/fix_DebScriptPackage

[Deb] fix package of Spark classes adding org.apache prefix in scripts embeded in .deb
(cherry picked from commit d992ec6d9be30e624c8edb2a50c193ac3cfbab7a)

Signed-off-by: Patrick Wendell <pw...@gmail.com>


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

Branch: refs/heads/branch-0.8
Commit: 4b2769bd6b4f13793e0b853ccc000b153d55e7d1
Parents: fde5347
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Dec 8 20:49:20 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Dec 8 21:36:52 2013 -0800

----------------------------------------------------------------------
 repl-bin/src/deb/bin/spark-executor | 2 +-
 repl-bin/src/deb/bin/spark-shell    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4b2769bd/repl-bin/src/deb/bin/spark-executor
----------------------------------------------------------------------
diff --git a/repl-bin/src/deb/bin/spark-executor b/repl-bin/src/deb/bin/spark-executor
index bcfae22..052d76f 100755
--- a/repl-bin/src/deb/bin/spark-executor
+++ b/repl-bin/src/deb/bin/spark-executor
@@ -19,4 +19,4 @@
 
 FWDIR="$(cd `dirname $0`; pwd)"
 echo "Running spark-executor with framework dir = $FWDIR"
-exec $FWDIR/run spark.executor.MesosExecutorBackend
+exec $FWDIR/run org.apache.spark.executor.MesosExecutorBackend

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/4b2769bd/repl-bin/src/deb/bin/spark-shell
----------------------------------------------------------------------
diff --git a/repl-bin/src/deb/bin/spark-shell b/repl-bin/src/deb/bin/spark-shell
index ec7e33e..118349d 100755
--- a/repl-bin/src/deb/bin/spark-shell
+++ b/repl-bin/src/deb/bin/spark-shell
@@ -18,4 +18,4 @@
 #
 
 FWDIR="$(cd `dirname $0`; pwd)"
-exec $FWDIR/run spark.repl.Main "$@"
+exec $FWDIR/run org.apache.spark.repl.Main "$@"