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

hadoop-mapreduce-project/CHANGES.txt

@@ -1369,6 +1369,8 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-2754. Fixed MR AM stdout, stderr and syslog to redirect to
     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
 
   INCOMPATIBLE CHANGES

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

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