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 10C678152 for ; Mon, 29 Aug 2011 00:05:20 +0000 (UTC) Received: (qmail 69487 invoked by uid 500); 29 Aug 2011 00:05:19 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 69001 invoked by uid 500); 29 Aug 2011 00:05:19 -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 68992 invoked by uid 99); 29 Aug 2011 00:05:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Aug 2011 00:05:18 +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, 29 Aug 2011 00:05:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6F1D7238889B for ; Mon, 29 Aug 2011 00:04:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1162614 - /hadoop/common/branches/branch-0.23/ Date: Mon, 29 Aug 2011 00:04:55 -0000 To: common-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110829000455.6F1D7238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: acmurthy Date: Mon Aug 29 00:04:53 2011 New Revision: 1162614 URL: http://svn.apache.org/viewvc?rev=1162614&view=rev Log: Merge -r 1162612:1162613 from trunk to branch-0.23 to fix MAPREDUCE-2898. Modified: hadoop/common/branches/branch-0.23/ (props changed) Propchange: hadoop/common/branches/branch-0.23/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 29 00:04:53 2011 @@ -1 +1 @@ -/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499 +/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613