Author: tucu
Date: Thu Mar 29 21:50:30 2012
New Revision: 1307129
URL: http://svn.apache.org/viewvc?rev=1307129&view=rev
Log:
Merge -r 1307123:1307124 from trunk to branch. FIXES: MAPREDUCE-4082
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=1307129&r1=1307128&r2=1307129&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu
Mar 29 21:50:30 2012
@@ -92,6 +92,9 @@ Release 2.0.0 - UNRELEASED
MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via
bobby)
+ MAPREDUCE-4082. hadoop-mapreduce-client-app's mrapp-generated-classpath
+ file should not be in the module JAR (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=1307129&r1=1307128&r2=1307129&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
Thu Mar 29 21:50:30 2012
@@ -97,7 +97,7 @@
<goal>build-classpath</goal>
</goals>
<configuration>
- <outputFile>target/classes/mrapp-generated-classpath</outputFile>
+
<outputFile>target/test-classes/mrapp-generated-classpath</outputFile>
</configuration>
</execution>
</executions>
