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

Merge -r 1174293:1174294 from trunk to branch-0.23 to fix MAPREDUCE-3073. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1174295 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2011-09-22 18:06:20 +00:00
parent c679348aa5
commit 2be11b42a1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1369,6 +1369,8 @@ Release 0.23.0 - Unreleased
MAPREDUCE-2754. Fixed MR AM stdout, stderr and syslog to redirect to MAPREDUCE-2754. Fixed MR AM stdout, stderr and syslog to redirect to
correct log-files. (Ravi Teja Ch N V via vinodkv) correct log-files. (Ravi Teja Ch N V via vinodkv)
MAPREDUCE-3073. Fixed build issues in MR1. (mahadev via acmurthy)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MRConstants.java
View File

@ -26,7 +26,7 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable;
*******************************/ *******************************/
@Private @Private
@Unstable @Unstable
public class MRConstants { public interface MRConstants {
// //
// Timeouts, constants // Timeouts, constants
// //
@ -57,4 +57,7 @@ public class MRConstants {
* The reduce task number for which this map output is being transferred * The reduce task number for which this map output is being transferred
*/ */
public static final String FOR_REDUCE_TASK = "for-reduce-task"; public static final String FOR_REDUCE_TASK = "for-reduce-task";
/** Used in MRv1, mostly in TaskTracker code **/
public static final String WORKDIR = "work";
} }