MAPREDUCE-4328. Merging to branch-1.1.

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

CHANGES.txt

@@ -23,13 +23,6 @@ Release 1.2.0 - unreleased
     HADOOP-7754. Expose file descriptors from Hadoop-wrapped local 
     FileSystems (todd and ahmed via tucu)
 
-    MAPREDUCE-4328. Add a JobTracker safemode to allow it to be resilient to
-    NameNode failures. The safemode can be entered either automatically via
-    the configurable background thread to monitor the NameNode or by the
-    admin. In the safemode the JobTracker doesn't schedule new tasks, marks
-    all failed tasks as KILLED for future retries and doesn't accept new job
-    submissions. (acmurthy)
-
     MAPREDUCE-461. Enable service-plugins for JobTracker. (Fredrik Hedberg and
     Brandon Li via vinodkv)
 
@@ -287,6 +280,13 @@ Release 1.1.0 - unreleased
     configured timeout and are selected as the last location to read from.
     (Jing Zhao via szetszwo)
 
+    MAPREDUCE-4328. Add a JobTracker safemode to allow it to be resilient to
+    NameNode failures. The safemode can be entered either automatically via
+    the configurable background thread to monitor the NameNode or by the
+    admin. In the safemode the JobTracker doesn't schedule new tasks, marks
+    all failed tasks as KILLED for future retries and doesn't accept new job
+    submissions. (acmurthy)
+
   IMPROVEMENTS
 
     HADOOP-8656. Backport forced daemon shutdown of HADOOP-8353 into branch-1