Author: tucu
Date: Fri Mar 30 21:31:34 2012
New Revision: 1307624
URL: http://svn.apache.org/viewvc?rev=1307624&view=rev
Log:
Merge -r 1307622:1307623 from trunk to branch. FIXES: MAPREDUCE-4091
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1307624&r1=1307623&r2=1307624&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri
Mar 30 21:31:34 2012
@@ -97,6 +97,8 @@ Release 2.0.0 - UNRELEASED
MAPREDUCE-3916. various issues with running yarn proxyserver (devaraj via
tucu)
+ MAPREDUCE-4091. tools testcases failing because of MAPREDUCE-4082 (tucu)
+
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml?rev=1307624&r1=1307623&r2=1307624&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
Fri Mar 30 21:31:34 2012
@@ -86,6 +86,11 @@
<phase>test-compile</phase>
</execution>
</executions>
+ <configuration>
+ <excludes>
+ <exclude>mrapp-generated-classpath</exclude>
+ </excludes>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -97,7 +102,7 @@
<goal>build-classpath</goal>
</goals>
<configuration>
-
<outputFile>target/test-classes/mrapp-generated-classpath</outputFile>
+ <outputFile>target/classes/mrapp-generated-classpath</outputFile>
</configuration>
</execution>
</executions>
