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/06 20:19:33 UTC
[1/2] git commit: Change protobuf version for yarn alpha back to 2.4.1
Updated Branches:
refs/heads/master 357083c29 -> 33fcb91e8
Change protobuf version for yarn alpha back to 2.4.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/1f7c090e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/1f7c090e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/1f7c090e
Branch: refs/heads/master
Commit: 1f7c090e4b5750987c300fda6fcf397bb518cd48
Parents: a2e7e04
Author: Thomas Graves <tg...@apache.org>
Authored: Mon Jan 6 12:04:22 2014 -0600
Committer: Thomas Graves <tg...@apache.org>
Committed: Mon Jan 6 12:04:22 2014 -0600
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/1f7c090e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aa2f076..72a9244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -727,7 +727,6 @@
<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>
- <protobuf.version>2.5.0</protobuf.version>
<!--<hadoop.version>2.0.5-alpha</hadoop.version> -->
</properties>
[2/2] git commit: Merge pull request #342 from
tgravescs/fix_maven_protobuf
Posted by pw...@apache.org.
Merge pull request #342 from tgravescs/fix_maven_protobuf
Change protobuf version for yarn alpha back to 2.4.1
The maven build for yarn-alpha uses the wrong protobuf version and hence the generated assembly jar doesn't work with Hadoop 0.23. Removing the setting for the yarn-alpha profile since the default protobuf version is 2.4.1 at the top of the pom 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/33fcb91e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/33fcb91e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/33fcb91e
Branch: refs/heads/master
Commit: 33fcb91e81f761237dd48a8947bb43f24f7a263a
Parents: 357083c 1f7c090
Author: Patrick Wendell <pw...@gmail.com>
Authored: Mon Jan 6 11:19:23 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Jan 6 11:19:23 2014 -0800
----------------------------------------------------------------------
pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------