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 /assembly/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 'assembly/pom.xml')
| -rw-r--r-- | assembly/pom.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/assembly/pom.xml b/assembly/pom.xml index c19e4bc986..9b70812c64 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -124,7 +124,17 @@ <profiles> <profile> - <id>hadoop2-yarn</id> + <id>yarn-alpha</id> + <dependencies> + <dependency> + <groupId>org.apache.spark</groupId> + <artifactId>spark-yarn-alpha_${scala.binary.version}</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>yarn</id> <dependencies> <dependency> <groupId>org.apache.spark</groupId> |