Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 24760 invoked from network); 11 Jan 2011 06:04:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Jan 2011 06:04:14 -0000 Received: (qmail 89253 invoked by uid 500); 11 Jan 2011 06:04:14 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 89148 invoked by uid 500); 11 Jan 2011 06:04:12 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 89140 invoked by uid 99); 11 Jan 2011 06:04:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jan 2011 06:04:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jan 2011 06:04:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0147823888E7; Tue, 11 Jan 2011 06:03:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1057496 - in /hadoop/mapreduce/branches/branch-0.22: CHANGES.txt src/java/org/apache/hadoop/util/package-info.java Date: Tue, 11 Jan 2011 06:03:47 -0000 To: mapreduce-commits@hadoop.apache.org From: nigel@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110111060348.0147823888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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. */ -/** - * Deprecated. 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