You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2013/08/04 22:15:27 UTC

svn commit: r1510333 [1/3] - in /hadoop/common/branches/branch-1: CHANGES.txt build.xml lib/jdiff/hadoop_1.2.1.xml src/docs/releasenotes.html

Author: mattf
Date: Sun Aug  4 20:15:27 2013
New Revision: 1510333

URL: http://svn.apache.org/r1510333
Log:
Update JDiff, releasenotes, and CHANGES.txt in branch-1 upon release of 1.2.1.

Added:
    hadoop/common/branches/branch-1/lib/jdiff/hadoop_1.2.1.xml
Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/build.xml
    hadoop/common/branches/branch-1/src/docs/releasenotes.html

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1510333&r1=1510332&r2=1510333&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Aug  4 20:15:27 2013
@@ -117,7 +117,7 @@ Release 1.3.0 - unreleased
     HDFS-5028. LeaseRenewer throws ConcurrentModificationException when timeout.
     (zhaoyunjiong via szetszwo)
 
-Release 1.2.1 - 2013.07.06
+Release 1.2.1 - 2013.07.15
 
   INCOMPATIBLE CHANGES
 
@@ -128,6 +128,9 @@ Release 1.2.1 - 2013.07.06
     HDFS-4880. Print the image and edits file loaded by the namenode in the
     logs. (Arpit Agarwal via suresh)
 
+    MAPREDUCE-4838. Addendum patch to fix TestRumenJobTraces.
+    (Arun C Murthy)
+
   BUG FIXES
 
     MAPREDUCE-5256. CombineInputFormat isn't thread safe affecting HiveServer.
@@ -176,6 +179,9 @@ Release 1.2.1 - 2013.07.06
     values for hash-tables to store Locality and Avataar for TaskAttempts.
     (zhaoyunjiong via acmurthy)
 
+    HADOOP-9730. Fix hadoop.spec to add task-log4j.properties. (Giridharan Kesavan
+    via mattf)
+
 Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1510333&r1=1510332&r2=1510333&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Sun Aug  4 20:15:27 2013
@@ -160,7 +160,7 @@
 
   <property name="jdiff.build.dir" value="${build.docs}/jdiff"/>
   <property name="jdiff.xml.dir" value="${lib.dir}/jdiff"/>
-  <property name="jdiff.stable" value="1.2.0"/>
+  <property name="jdiff.stable" value="1.2.1"/>
   <property name="jdiff.stable.javadoc" 
             value="http://hadoop.apache.org/core/docs/r${jdiff.stable}/api/"/>