Author: tomwhite
Date: Mon Mar 7 21:48:05 2011
New Revision: 1078968
URL: http://svn.apache.org/viewvc?rev=1078968&view=rev
Log:
Merge -r 1078963:1078964 from trunk to branch-0.22. Fixes: MAPREDUCE-2336
Added:
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapred/tools/package-info.java
- copied unchanged from r1078964,
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/tools/package-info.java
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/mapreduce/tools/package-info.java
- copied unchanged from r1078964,
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/tools/package-info.java
hadoop/mapreduce/branches/branch-0.22/src/tools/org/apache/hadoop/fs/package-info.java
- copied unchanged from r1078964,
hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/fs/package-info.java
hadoop/mapreduce/branches/branch-0.22/src/tools/org/apache/hadoop/tools/package-info.java
- copied unchanged from r1078964,
hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/package-info.java
Modified:
hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
hadoop/mapreduce/branches/branch-0.22/build.xml
Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1078968&r1=1078967&r2=1078968&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Mon Mar 7 21:48:05 2011
@@ -507,6 +507,9 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2284. TestLocalRunner.testMultiMaps times out (todd)
+ MAPREDUCE-2336. Tool-related packages should be in the Tool javadoc group.
+ (tomwhite)
+
Release 0.21.1 - Unreleased
NEW FEATURES
Modified: hadoop/mapreduce/branches/branch-0.22/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/build.xml?rev=1078968&r1=1078967&r2=1078968&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.22/build.xml Mon Mar 7 21:48:05 2011
@@ -1046,7 +1046,7 @@
<group title="Packages" packages="org.apache.*"/>
<group title="Libraries"
packages="org.apache.hadoop.mapred.lib*:org.apache.hadoop.mapreduce.lib*"/>
- <group title="Tools" packages="org.apache.hadoop.tools"/>
+ <group title="Tools"
packages="org.apache.hadoop.fs*:org.apache.hadoop.tools*:org.apache.hadoop.mapred.tool*:org.apache.hadoop.mapreduce.tool*"/>
<group title="Examples" packages="org.apache.hadoop.examples*"/>
<group title="contrib: DataJoin"
packages="org.apache.hadoop.contrib.utils.join*"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
