Author: nigel
Date: Tue Jan 11 06:03:47 2011
New Revision: 1057496
URL: http://svn.apache.org/viewvc?rev=1057496&view=rev
Log:
MAPREDUCE-2084. Merge -r 1057494:1057495. Remove deprecate annotation from
package javadoc file. (Contributed by tomwhite)
Modified:
hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (contents, props
changed)
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/package-info.java
Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1057496&r1=1057495&r2=1057496&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Tue Jan 11 06:03:47 2011
@@ -418,6 +418,10 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2219. JobTracker should not try to remove mapred.system.dir
during startup. (todd)
+ MAPREDUCE-2084. Remove deprecate annotation for package file. The package
+ classes themselves are already deprecated. This removes an Eclipse error.
+ (tomwhite via nigel)
+
Release 0.21.1 - Unreleased
NEW FEATURES
Propchange: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 11 06:03:47 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112
/hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964
-/hadoop/mapreduce/trunk/CHANGES.txt:1037075,1052106,1053730,1054873
+/hadoop/mapreduce/trunk/CHANGES.txt:1037075,1052106,1053730,1054873,1057495
Modified:
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/package-info.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/package-info.java?rev=1057496&r1=1057495&r2=1057496&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/package-info.java
(original)
+++
hadoop/mapreduce/branches/branch-0.22/src/java/org/apache/hadoop/util/package-info.java
Tue Jan 11 06:03:47 2011
@@ -15,10 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/**
- * <b>Deprecated.</b> Use {...@link org.apache.hadoop.mapreduce.util} instead.
- */
-...@deprecated
+
@InterfaceAudience.Private
package org.apache.hadoop.util;
import org.apache.hadoop.classification.InterfaceAudience;
\ No newline at end of file
