diff options
author | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
commit | 604fad9c39763012d97b404941f7ba7137ec2eed (patch) | |
tree | a327c39fcf9ac53e17fbeb5dfedb11e04f505f3c /pom.xml | |
parent | 9e6f3bdcda1ab48159afa4f54b64d05e42a8688e (diff) | |
parent | c4d6145f7fde8a516024e886314bf8fecde817ea (diff) | |
download | spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.gz spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.bz2 spark-604fad9c39763012d97b404941f7ba7137ec2eed.zip |
Merge remote-tracking branch 'apache-github/master' into remove-binaries
Conflicts:
core/src/test/scala/org/apache/spark/DriverSuite.scala
docs/python-programming-guide.md
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 59 |
1 files changed, 11 insertions, 48 deletions
@@ -722,7 +722,7 @@ <profiles> <profile> - <id>hadoop2-yarn</id> + <id>yarn-alpha</id> <properties> <hadoop.major.version>2</hadoop.major.version> <!-- 0.23.* is same as 2.0.* - except hardened to run production jobs --> @@ -735,57 +735,20 @@ <module>yarn</module> </modules> - <repositories> - <repository> - <id>maven-root</id> - <name>Maven root repository</name> - <url>http://repo1.maven.org/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - - <dependencyManagement> - <dependencies> - </dependencies> - </dependencyManagement> </profile> <profile> - <id>new-yarn</id> - <properties> - <hadoop.major.version>2</hadoop.major.version> - <hadoop.version>2.2.0</hadoop.version> - <protobuf.version>2.5.0</protobuf.version> - </properties> - - <modules> - <module>new-yarn</module> - </modules> - - <repositories> - <repository> - <id>maven-root</id> - <name>Maven root repository</name> - <url>http://repo1.maven.org/maven2</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> + <id>yarn</id> + <properties> + <hadoop.major.version>2</hadoop.major.version> + <hadoop.version>2.2.0</hadoop.version> + <protobuf.version>2.5.0</protobuf.version> + </properties> + <modules> + <module>yarn</module> + </modules> - <dependencyManagement> - <dependencies> - </dependencies> - </dependencyManagement> - </profile> + </profile> <profile> <id>repl-bin</id> |