diff options
| author | Y.CORP.YAHOO.COM\tgraves <tgraves@thatenemy-lm.champ.corp.yahoo.com> | 2013-09-03 08:36:59 -0500 |
|---|---|---|
| committer | Y.CORP.YAHOO.COM\tgraves <tgraves@thatenemy-lm.champ.corp.yahoo.com> | 2013-09-03 08:36:59 -0500 |
| commit | 547fc4a4120a2bb3a6aeca66dd0cd568534ba65a (patch) | |
| tree | bfb00a0a5925ca9a08d6e7a05cc33a411a5873c1 /yarn/pom.xml | |
| parent | 96452eea56c289e25a711ca54c812723a5059739 (diff) | |
| parent | 59218bdd4996a13116009e3669b1b875be23a694 (diff) | |
| download | spark-547fc4a4120a2bb3a6aeca66dd0cd568534ba65a.tar.gz spark-547fc4a4120a2bb3a6aeca66dd0cd568534ba65a.tar.bz2 spark-547fc4a4120a2bb3a6aeca66dd0cd568534ba65a.zip | |
Merge remote-tracking branch 'mesos/master' into yarnUILink
Conflicts:
core/src/main/scala/org/apache/spark/ui/UIUtils.scala
core/src/main/scala/org/apache/spark/ui/jobs/PoolTable.scala
core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
docs/running-on-yarn.md
Diffstat (limited to 'yarn/pom.xml')
| -rw-r--r-- | yarn/pom.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/yarn/pom.xml b/yarn/pom.xml index 07dd170eae..654b5bcd2d 100644 --- a/yarn/pom.xml +++ b/yarn/pom.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- ~ Licensed to the Apache Software Foundation (ASF) under one or more +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more ~ contributor license agreements. See the NOTICE file distributed with ~ this work for additional information regarding copyright ownership. ~ The ASF licenses this file to You under the Apache License, Version 2.0 @@ -14,21 +15,20 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.spark-project</groupId> + <groupId>org.apache.spark</groupId> <artifactId>spark-parent</artifactId> <version>0.8.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.spark-project</groupId> + <groupId>org.apache.spark</groupId> <artifactId>spark-yarn</artifactId> <packaging>jar</packaging> <name>Spark Project YARN Support</name> - <url>http://spark-project.org/</url> + <url>http://spark.incubator.apache.org/</url> <build> <outputDirectory>target/scala-${scala.version}/classes</outputDirectory> @@ -81,7 +81,7 @@ <id>hadoop2-yarn</id> <dependencies> <dependency> - <groupId>org.spark-project</groupId> + <groupId>org.apache.spark</groupId> <artifactId>spark-core</artifactId> <version>${project.version}</version> </dependency> |