Merge -c 1188997 from trunk to branch-0.23 to complete fix for MAPREDUCE-3263.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188998 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -1709,6 +1709,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3253. Fixed ContextFactory to clone JobContext correctly.
     (acmurthy) 
 
+    MAPREDUCE-3263. Fixed the MAPREDUCE-3028 commit which broke MR1. (Hitesh
+    Shah via acmurthy) 
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/NotificationTestCase.java

@@ -130,8 +130,8 @@ public abstract class NotificationTestCase extends HadoopTestCase {
   protected JobConf createJobConf() {
     JobConf conf = super.createJobConf();
     conf.setJobEndNotificationURI(getNotificationUrlTemplate());
-    conf.setInt(JobContext.END_NOTIFICATION_RETRIES, 3);
-    conf.setInt(JobContext.END_NOTIFICATION_RETRIE_INTERVAL, 200);
+    conf.setInt(JobContext.MR_JOB_END_RETRY_ATTEMPTS, 3);
+    conf.setInt(JobContext.MR_JOB_END_RETRY_INTERVAL, 200);
     return conf;
   }