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 EE3F663EB for ; Mon, 25 Jul 2011 19:33:23 +0000 (UTC) Received: (qmail 61938 invoked by uid 500); 25 Jul 2011 19:33:23 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 61885 invoked by uid 500); 25 Jul 2011 19:33:23 -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 61872 invoked by uid 99); 25 Jul 2011 19:33:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jul 2011 19:33:22 +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, 25 Jul 2011 19:33:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EB8682388A33 for ; Mon, 25 Jul 2011 19:33:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1150862 - in /hadoop/common/branches/branch-0.20-security-204: ./ src/core/org/apache/hadoop/fs/ src/mapred/ src/test/org/apache/hadoop/fs/ src/tools/org/apache/hadoop/tools/ Date: Mon, 25 Jul 2011 19:33:00 -0000 To: common-commits@hadoop.apache.org From: ddas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110725193300.EB8682388A33@eris.apache.org> Author: ddas Date: Mon Jul 25 19:32:59 2011 New Revision: 1150862 URL: http://svn.apache.org/viewvc?rev=1150862&view=rev Log: Merge -r 1150859:1150860 from branch-0.20-security onto branch-0.20-security-204 Modified: hadoop/common/branches/branch-0.20-security-204/ (props changed) hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/fs/HarFileSystem.java (props changed) hadoop/common/branches/branch-0.20-security-204/src/mapred/ (props changed) hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/fs/TestHarFileSystem.java (props changed) hadoop/common/branches/branch-0.20-security-204/src/tools/org/apache/hadoop/tools/HadoopArchives.java (props changed) Propchange: hadoop/common/branches/branch-0.20-security-204/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 25 19:32:59 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225 -/hadoop/common/branches/branch-0.20-security:1097202,1098837,1100336,1134140,1150528 +/hadoop/common/branches/branch-0.20-security:1097202,1098837,1100336,1134140,1150528,1150860 /hadoop/common/branches/branch-0.20-security-203:1096071,1097012-1099333,1102071,1128115 /hadoop/core/branches/branch-0.19:713112 /hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569 Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1150862&r1=1150861&r2=1150862&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Mon Jul 25 19:32:59 2011 @@ -1,8 +1,5 @@ Hadoop Change Log - MAPREDUCE-2621. TestCapacityScheduler fails with "Queue "q1" does not exist". - (Sherry Chen via mahadev) - Release 0.20.204.0 - unreleased NEW FEATURES @@ -16,6 +13,9 @@ Release 0.20.204.0 - unreleased BUG FIXES + MAPREDUCE-2621. TestCapacityScheduler fails with "Queue "q1" does not exist". + (Sherry Chen via mahadev) + HADOOP-7475. Fix hadoop-setup-single-node.sh to reflect new layout. (eyang via omalley) Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 25 19:32:59 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225 -/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1101315,1101629,1101729,1102378,1102869,1103940,1125139,1125170,1125587,1125589,1127362,1130409,1131277,1131280,1131286,1131290,1131299,1131461,1131737,1134140,1150528 +/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1101315,1101629,1101729,1102378,1102869,1103940,1125139,1125170,1125587,1125589,1127362,1130409,1131277,1131280,1131286,1131290,1131299,1131461,1131737,1134140,1150528,1150860 /hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097012-1099333,1102071,1128115 /hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1132788,1133133,1133274,1133282,1133475 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226 Propchange: hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/fs/HarFileSystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 25 19:32:59 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/src/core/org/apache/hadoop/fs/HarFileSystem.java:826138,826568,833001,880632,898713 -/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/fs/HarFileSystem.java:1100336,1150528 +/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/fs/HarFileSystem.java:1100336,1150528,1150860 /hadoop/common/branches/branch-0.20-security-203/src/core/org/apache/hadoop/fs/HarFileSystem.java:1128115 /hadoop/common/trunk/src/core/org/apache/hadoop/fs/HarFileSystem.java:910709 /hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java:979485 Propchange: hadoop/common/branches/branch-0.20-security-204/src/mapred/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 25 19:32:59 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/src/mapred:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225 -/hadoop/common/branches/branch-0.20-security/src/mapred:1097202,1098837,1100336,1134140,1150528 +/hadoop/common/branches/branch-0.20-security/src/mapred:1097202,1098837,1100336,1134140,1150528,1150860 /hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071,1097012-1099333,1128115 /hadoop/core/branches/branch-0.19/src/mapred:713112 /hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569 Propchange: hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/fs/TestHarFileSystem.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 25 19:32:59 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:826138,826568,833001,880632,898713 -/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1100336,1150528 +/hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1100336,1150528,1150860 /hadoop/common/branches/branch-0.20-security-203/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:1128115 /hadoop/common/trunk/src/test/core/org/apache/hadoop/fs/TestHarFileSystem.java:979485 /hadoop/common/trunk/src/test/org/apache/hadoop/fs/TestHarFileSystem.java:910709 Propchange: hadoop/common/branches/branch-0.20-security-204/src/tools/org/apache/hadoop/tools/HadoopArchives.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 25 19:32:59 2011 @@ -1,5 +1,5 @@ /hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java:826138,826568,833001,880632,898713 -/hadoop/common/branches/branch-0.20-security/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1100336,1150528 +/hadoop/common/branches/branch-0.20-security/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1100336,1150528,1150860 /hadoop/common/branches/branch-0.20-security-203/src/tools/org/apache/hadoop/tools/HadoopArchives.java:1128115 /hadoop/common/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java:910709 /hadoop/core/branches/branch-0.19/src/tools/org/apache/hadoop/tools/HadoopArchives.java:713112