diff options
| author | Holden Karau <holden@pigscanfly.ca> | 2013-09-14 15:54:04 -0700 |
|---|---|---|
| committer | Holden Karau <holden@pigscanfly.ca> | 2013-09-14 15:54:04 -0700 |
| commit | 452db1083c956b9f776d09d2c4fff1d93a428907 (patch) | |
| tree | 0665e8f55e1c5349b20cb7c255f522d6f5a3174e | |
| parent | bfcddf4700023f53d5eed92ef8ef75c072af3ced (diff) | |
| parent | c4c1db2dd5b2ec0a8182369ecdb0e14f4e199822 (diff) | |
| download | spark-452db1083c956b9f776d09d2c4fff1d93a428907.tar.gz spark-452db1083c956b9f776d09d2c4fff1d93a428907.tar.bz2 spark-452db1083c956b9f776d09d2c4fff1d93a428907.zip | |
Merge branch 'master' of https://github.com/mesos/spark
| -rw-r--r-- | pom.xml | 12 | ||||
| -rw-r--r-- | yarn/pom.xml | 5 |
2 files changed, 12 insertions, 5 deletions
@@ -38,6 +38,7 @@ </licenses> <scm> <connection>scm:git:git@github.com:apache/incubator-spark.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-spark.git</developerConnection> <url>scm:git:git@github.com:apache/incubator-spark.git</url> </scm> <developers> @@ -81,6 +82,7 @@ <slf4j.version>1.7.2</slf4j.version> <log4j.version>1.2.17</log4j.version> <hadoop.version>1.0.4</hadoop.version> + <yarn.version>0.23.7</yarn.version> <hbase.version>0.94.6</hbase.version> <PermGen>64m</PermGen> @@ -381,7 +383,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-api</artifactId> - <version>${hadoop.version}</version> + <version>${yarn.version}</version> <exclusions> <exclusion> <groupId>asm</groupId> @@ -412,7 +414,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-common</artifactId> - <version>${hadoop.version}</version> + <version>${yarn.version}</version> <exclusions> <exclusion> <groupId>asm</groupId> @@ -443,7 +445,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-client</artifactId> - <version>${hadoop.version}</version> + <version>${yarn.version}</version> <exclusions> <exclusion> <groupId>asm</groupId> @@ -699,8 +701,8 @@ <properties> <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> --> - <hadoop.version>2.0.5-alpha</hadoop.version> + <hadoop.version>0.23.7</hadoop.version> + <!--<hadoop.version>2.0.5-alpha</hadoop.version> --> </properties> <modules> diff --git a/yarn/pom.xml b/yarn/pom.xml index 27b2002095..21b650d1ea 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -49,6 +49,11 @@ <artifactId>hadoop-yarn-client</artifactId> </dependency> <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + <version>${yarn.version}</version> + </dependency> + <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> </dependency> |