Reverted changes to TaskAttemptState and mr_protos to facilitate clean merge from trunk (sseth)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-3902@1400217 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/api/records/TaskAttemptState.java

@@ -19,31 +19,17 @@
 package org.apache.hadoop.mapreduce.v2.api.records;
 
 public enum TaskAttemptState {
-  // States in new implementation.
   NEW, 
-  START_WAIT, 
-  RUNNING,
-  COMMIT_PENDING, 
-  KILLED,
-  FAILED,
-  KILL_IN_PROGRESS,
-  FAIL_IN_PROGRESS,
-  SUCCEEDED,
-  
-  
-  // States in old implementation.
-       //  NEW, 
   UNASSIGNED, 
   ASSIGNED, 
-       //  RUNNING, 
-       //  COMMIT_PENDING, 
+  RUNNING, 
+  COMMIT_PENDING, 
   SUCCESS_CONTAINER_CLEANUP, 
-       //  SUCCEEDED, 
+  SUCCEEDED, 
   FAIL_CONTAINER_CLEANUP, 
   FAIL_TASK_CLEANUP, 
-       //  FAILED, 
+  FAILED, 
   KILL_CONTAINER_CLEANUP, 
   KILL_TASK_CLEANUP, 
-       //  KILLED
-        
+  KILLED
 }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/proto/mr_protos.proto

@@ -105,9 +105,6 @@ enum TaskAttemptStateProto {
   TA_KILL_CONTAINER_CLEANUP = 11;
   TA_KILL_TASK_CLEANUP = 12;
   TA_KILLED = 13;
-  TA_START_WAIT=14;
-  TA_KILL_IN_PROGRESS=15;
-  TA_FAIL_IN_PROGRESS=16;
 }
 
 message TaskAttemptReportProto {