diff options
| author | liguoqiang <liguoqiang@rd.tuan800.com> | 2014-01-03 16:06:34 +0800 |
|---|---|---|
| committer | liguoqiang <liguoqiang@rd.tuan800.com> | 2014-01-03 16:06:34 +0800 |
| commit | 8ddbd531a4112239a2fd63591b8184b438768a0c (patch) | |
| tree | 45a18f715f0b7ef572e89021fa61275566f97ff0 /assembly | |
| parent | b27b75f1c595139bdcebbadb43e89b0a7eadf2b5 (diff) | |
| parent | 30b9db0abedbef7afa06a927a011147cfeca2a70 (diff) | |
| download | spark-8ddbd531a4112239a2fd63591b8184b438768a0c.tar.gz spark-8ddbd531a4112239a2fd63591b8184b438768a0c.tar.bz2 spark-8ddbd531a4112239a2fd63591b8184b438768a0c.zip | |
merge upstream/master
Diffstat (limited to 'assembly')
| -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 fc2adc1fbb..079509bec6 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> |