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/10 08:13:42 UTC
git commit: Updating CHANGES and one fix from last merge
Updated Branches:
refs/heads/branch-0.8 d03589de7 -> 81293289e
Updating CHANGES and one fix from last merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/81293289
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/81293289
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/81293289
Branch: refs/heads/branch-0.8
Commit: 81293289ee7dfa4db0c5b4ec89faf4fa72d3ba10
Parents: d03589d
Author: Patrick Wendell <pw...@gmail.com>
Authored: Mon Dec 9 23:13:15 2013 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Dec 9 23:13:15 2013 -0800
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
new-yarn/pom.xml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/81293289/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ce0aeab..efafab2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,10 @@ Spark Change Log
Release 0.8.1-incubating
+ d03589d Mon Dec 9 23:10:00 2013 -0800
+ Merge pull request #248 from colorant/branch-0.8
+ [Fix POM file for mvn assembly on hadoop 2.2 Yarn]
+
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]
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/81293289/new-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/new-yarn/pom.xml b/new-yarn/pom.xml
index 3310f04..556fd37 100644
--- a/new-yarn/pom.xml
+++ b/new-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-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>