Author: acmurthy
Date: Tue Sep 25 17:33:41 2012
New Revision: 1390011

URL: http://svn.apache.org/viewvc?rev=1390011&view=rev
Log:
MAPREDUCE-4328. Merging to branch-1.1.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1390011&r1=1390010&r2=1390011&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Tue Sep 25 17:33:41 2012
@@ -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


Reply via email to