Merge -c 1480447 from branch-1 to branch-1.2 to fix MAPREDUCE-5148. Fix MAPREDUCE-4970 to ensure task-log4j.properties is available for previous installs by putting it in hadoop-core.jar. Contributed by Arun C. Murthy.

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

CHANGES.txt

@@ -1,5 +1,22 @@
 Hadoop Change Log
 
+Release 1.2.1 - Unreleased 
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  BUG FIXES
+
+    MAPREDUCE-5206. Ensure that a job doesn't get added to RetiredJobs
+    multiple times in JobTracker. (acmurthy)
+
+    MAPREDUCE-5148. Fix MAPREDUCE-4970 to ensure task-log4j.properties is
+    available for previous installs by putting it in hadoop-core.jar.
+    (acmurthy)
+
 Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES
@@ -624,9 +641,6 @@ Release 1.2.0 - 2013.05.05
 
     HADOOP-9544. Backport UTF8 encoding fixes.  (Chris Nauroth via szetszwo)
 
-    MAPREDUCE-5206. Ensure that a job doesn't get added to RetiredJobs
-    multiple times in JobTracker. (acmurthy)
-
 Release 1.1.2 - 2013.01.30
 
   INCOMPATIBLE CHANGES

build.xml

@@ -758,7 +758,7 @@
       <tarfileset dir="bin" mode="755"/>
     </tar>
     <property name="jar.properties.list"
-      value="commons-logging.properties, log4j.properties, hadoop-metrics.properties"/>
+      value="commons-logging.properties, log4j.properties, hadoop-metrics.properties, task-log4j.properties"/>
     <jar jarfile="${build.dir}/${core.final.name}.jar"
          basedir="${build.classes}">
       <manifest>