svn commit: r885558 - in /hadoop/hdfs/branches/branch-0.21: CHANGES.txt build.xml

[co...@apache.org]

Author: cos
Date: Mon Nov 30 19:36:39 2009
New Revision: 885558

URL: http://svn.apache.org/viewvc?rev=885558&view=rev
Log:
HDFS-791. svn merge -c 885538 from trunk to branch 0.21

Modified:
    hadoop/hdfs/branches/branch-0.21/CHANGES.txt
    hadoop/hdfs/branches/branch-0.21/build.xml

Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=885558&r1=885557&r2=885558&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Mon Nov 30 19:36:39 2009
@@ -468,6 +468,8 @@
     HDFS-646. Fix test-patch failure by adding test-contrib ant target.
     (gkesavan)
 
+    HDFS-791. Build is broken after HDFS-787 patch has been applied (cos)
+
 Release 0.20.2 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/hdfs/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/build.xml?rev=885558&r1=885557&r2=885558&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/build.xml Mon Nov 30 19:36:39 2009
@@ -317,7 +317,7 @@
     <taskdef
         resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
       <classpath>
-        <pathelement location="${common.ivy.lib.dir}/aspectjtools-1.6.4.jar"/>
+        <pathelement location="${common.ivy.lib.dir}/aspectjtools-1.6.5.jar"/>
       </classpath>
     </taskdef>
     <echo message="Start weaving aspects in place"/>