Author: cos
Date: Thu Jul 22 05:49:20 2010
New Revision: 966509
URL: http://svn.apache.org/viewvc?rev=966509&view=rev
Log:
HADOOP-6790. svn merge -c 966508 from trunk
Modified:
hadoop/common/branches/branch-0.21/ (props changed)
hadoop/common/branches/branch-0.21/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.21/src/contrib/ec2/ (props changed)
hadoop/common/branches/branch-0.21/src/docs/ (props changed)
hadoop/common/branches/branch-0.21/src/java/ (props changed)
hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml
hadoop/common/branches/branch-0.21/src/test/core/ (props changed)
Propchange: hadoop/common/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 05:49:20 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939
+/hadoop/common/trunk:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=966509&r1=966508&r2=966509&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Thu Jul 22 05:49:20 2010
@@ -908,6 +908,9 @@ Release 0.21.0 - 2010-07-01
BUG FIXES
+ HADOOP-6790. Instrumented (Herriot) build uses too wide mask to include
+ aspect files. (Konstantin Boudnik)
+
HADOOP-6860. 'compile-fault-inject' should never be called directly.
(Konstantin Boudnik)
Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 05:49:20 2010
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,951614,953504,955438,961559,962914,964130,964134,964939
+/hadoop/common/trunk/CHANGES.txt:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,951614,953504,955438,961559,962914,964130,964134,964939,966508
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange: hadoop/common/branches/branch-0.21/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 05:49:20 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939
+/hadoop/common/trunk/src/contrib/ec2:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508
/hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
/hadoop/core/trunk/src/contrib/ec2:776175-784663
Propchange: hadoop/common/branches/branch-0.21/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 05:49:20 2010
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939
+/hadoop/common/trunk/src/docs:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 05:49:20 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939
+/hadoop/common/trunk/src/java:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified: hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml?rev=966509&r1=966508&r2=966509&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml (original)
+++ hadoop/common/branches/branch-0.21/src/test/aop/build/aop.xml Thu Jul 22
05:49:20 2010
@@ -63,7 +63,7 @@
<iajc
encoding="${build.encoding}"
srcdir="${java.src.dir};${build.src};${src.dir.path}"
- includes="**/org/apache/hadoop/**/*.java, **/org/apache/hadoop/**/*.aj"
+ includes="org/apache/hadoop/**/*.java, org/apache/hadoop/**/*.aj"
excludes="org/apache/hadoop/classification/tools/**/*,
org/apache/hadoop/record/**/*"
destDir="${dest.dir}"
debug="${javac.debug}"
@@ -157,7 +157,7 @@
<mkdir dir="${build-fi.dir}"/>
<delete file="${compile-inject.output}"/>
<weave-injectfault-aspects dest.dir="${system-test-build-dir}/classes"
- src.dir="${test.src.dir}/system">
+
src.dir="${test.src.dir}/system/java;${test.src.dir}/system/aop">
</weave-injectfault-aspects>
</target>
Propchange: hadoop/common/branches/branch-0.21/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 22 05:49:20 2010
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939
+/hadoop/common/trunk/src/test/core:944521,945941-945953,947218,947222,947882,948174,948237,948242,950309,951259,955438,961559,962914,964130,964134,964939,966508
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278
