Author: atm
Date: Sat Jan 28 00:21:07 2012
New Revision: 1236936
URL: http://svn.apache.org/viewvc?rev=1236936&view=rev
Log:
Merge trunk into HA branch.
Modified:
hadoop/common/branches/HDFS-1623/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-tools-dist/pom.xml
Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 28 00:21:07 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1236328
+/hadoop/common/trunk:1152502-1236935
Modified: hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1236936&r1=1236935&r2=1236936&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Sat Jan 28 00:21:07
2012
@@ -225,6 +225,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-rumen</artifactId>
<version>${project.version}</version>
</dependency>
Modified: hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml?rev=1236936&r1=1236935&r2=1236936&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml Sat Jan
28 00:21:07 2012
@@ -61,6 +61,7 @@
<item name="YARN Architecture"
href="hadoop-yarn/hadoop-yarn-site/YARN.html"/>
<item name="Writing Yarn Applications"
href="hadoop-yarn/hadoop-yarn-site/WritingYarnApplications.html"/>
<item name="Capacity Scheduler"
href="hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html"/>
+ <item name="Web Application Proxy"
href="hadoop-yarn/hadoop-yarn-site/WebApplicationProxy.html"/>
</menu>
<menu name="YARN REST API's" inherit="top">
Modified: hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/pom.xml?rev=1236936&r1=1236935&r2=1236936&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/pom.xml
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-distcp/pom.xml Sat Jan
28 00:21:07 2012
@@ -20,7 +20,7 @@
<version>0.24.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
- <groupId>org.apache.hadoop.tools</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
<version>0.24.0-SNAPSHOT</version>
<description>Apache Hadoop Distributed Copy</description>
Modified:
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-tools-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1236936&r1=1236935&r2=1236936&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-tools-dist/pom.xml
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-tools-dist/pom.xml Sat
Jan 28 00:21:07 2012
@@ -40,6 +40,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-distcp</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-archives</artifactId>
<scope>compile</scope>
</dependency>
