Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F7FA6205 for ; Mon, 6 Jun 2011 01:23:20 +0000 (UTC) Received: (qmail 59861 invoked by uid 500); 6 Jun 2011 01:23:20 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 59839 invoked by uid 500); 6 Jun 2011 01:23:20 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 59832 invoked by uid 99); 6 Jun 2011 01:23:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jun 2011 01:23:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 06 Jun 2011 01:23:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ACAA823889D5; Mon, 6 Jun 2011 01:22:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1132512 - in /hadoop/common/branches/branch-0.22: ./ CHANGES.txt build.xml src/docs/ src/java/ src/test/core/ src/test/core/org/apache/hadoop/io/TestSequenceFile.java Date: Mon, 06 Jun 2011 01:22:58 -0000 To: common-commits@hadoop.apache.org From: eli@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110606012258.ACAA823889D5@eris.apache.org> Author: eli Date: Mon Jun 6 01:22:58 2011 New Revision: 1132512 URL: http://svn.apache.org/viewvc?rev=1132512&view=rev Log: HADOOP-7335. svn merge -c 1132511 from trunk Modified: hadoop/common/branches/branch-0.22/ (props changed) hadoop/common/branches/branch-0.22/CHANGES.txt hadoop/common/branches/branch-0.22/build.xml hadoop/common/branches/branch-0.22/src/docs/ (props changed) hadoop/common/branches/branch-0.22/src/java/ (props changed) hadoop/common/branches/branch-0.22/src/test/core/ (props changed) hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java (props changed) Propchange: hadoop/common/branches/branch-0.22/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 6 01:22:58 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287 +/hadoop/common/trunk:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287,1132511 /hadoop/core/branches/branch-0.19/core:713112 Modified: hadoop/common/branches/branch-0.22/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1132512&r1=1132511&r2=1132512&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.22/CHANGES.txt Mon Jun 6 01:22:58 2011 @@ -251,6 +251,9 @@ Release 0.22.0 - Unreleased HADOOP-7355 Add audience and stability annotations to HttpServer class (stack) + HADOOP-7335. Force entropy to come from non-true random for tests. + (todd via eli) + OPTIMIZATIONS HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..). Modified: hadoop/common/branches/branch-0.22/build.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/build.xml?rev=1132512&r1=1132511&r2=1132512&view=diff ============================================================================== --- hadoop/common/branches/branch-0.22/build.xml (original) +++ hadoop/common/branches/branch-0.22/build.xml Mon Jun 6 01:22:58 2011 @@ -721,6 +721,7 @@ + Propchange: hadoop/common/branches/branch-0.22/src/docs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 6 01:22:58 2011 @@ -1,2 +1,2 @@ -/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287 +/hadoop/common/trunk/src/docs:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287,1132511 /hadoop/core/branches/branch-0.19/src/docs:713112 Propchange: hadoop/common/branches/branch-0.22/src/java/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 6 01:22:58 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287 +/hadoop/common/trunk/src/java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287,1132511 /hadoop/core/branches/branch-0.19/core/src/java:713112 /hadoop/core/trunk/src/core:776175-785643,785929-786278 Propchange: hadoop/common/branches/branch-0.22/src/test/core/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 6 01:22:58 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287 +/hadoop/common/trunk/src/test/core:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287,1132511 /hadoop/core/branches/branch-0.19/core/src/test/core:713112 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278 Propchange: hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSequenceFile.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 6 01:22:58 2011 @@ -1,3 +1,3 @@ -/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287 +/hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSequenceFile.java:1037901,1039952,1040408,1040849,1044490,1050070,1054848,1054853,1054903,1058881,1065858,1070021,1071021,1071084,1080797,1095958,1096522,1100044,1100048,1100056,1102914,1103931,1124456,1126287,1132511 /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:713112 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFile.java:776175-785643