Author: acmurthy
Date: Wed May 8 20:45:02 2013
New Revision: 1480448
URL: http://svn.apache.org/r1480448
Log:
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.
Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/build.xml
Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1480448&r1=1480447&r2=1480448&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Wed May 8 20:45:02 2013
@@ -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
Modified: hadoop/common/branches/branch-1.2/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/build.xml?rev=1480448&r1=1480447&r2=1480448&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/build.xml (original)
+++ hadoop/common/branches/branch-1.2/build.xml Wed May 8 20:45:02 2013
@@ -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>
