Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1367726. FIXES: MAPREDUCE-4483. 2.0 build does not work (John George via bobby) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367729 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans 2012-07-31 19:50:11 +00:00
parent e265f69a18
commit 6817f87461
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -337,6 +337,8 @@ Release 2.0.0-alpha - 05-23-2012
MAPREDUCE-4231. Update RAID to use the new BlockCollection interface. MAPREDUCE-4231. Update RAID to use the new BlockCollection interface.
(szetszwo) (szetszwo)
MAPREDUCE-4483. 2.0 build does not work (John George via bobby)
Release 0.23.3 - UNRELEASED Release 0.23.3 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/pom.xml
View File

@ -19,12 +19,12 @@
<parent> <parent>
<artifactId>hadoop-yarn-applications</artifactId> <artifactId>hadoop-yarn-applications</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>3.0.0-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-applications-unmanaged-am-launcher</artifactId> <artifactId>hadoop-yarn-applications-unmanaged-am-launcher</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>2.0.1-SNAPSHOT</version>
<name>hadoop-yarn-applications-unmanaged-am-launcher</name> <name>hadoop-yarn-applications-unmanaged-am-launcher</name>
<properties> <properties>
@ -64,7 +64,6 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-applications-distributedshell</artifactId> <artifactId>hadoop-yarn-applications-distributedshell</artifactId>
<version>3.0.0-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

6
hadoop-project/pom.xml
View File

@ -200,6 +200,12 @@
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-applications-distributedshell</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId>