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 12D39C782 for ; Thu, 3 May 2012 17:22:36 +0000 (UTC) Received: (qmail 3518 invoked by uid 500); 3 May 2012 17:22:35 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 3463 invoked by uid 500); 3 May 2012 17:22:35 -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 3454 invoked by uid 99); 3 May 2012 17:22:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2012 17:22:35 +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; Thu, 03 May 2012 17:22:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D511623889BB for ; Thu, 3 May 2012 17:22:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333559 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/src/site/ Date: Thu, 03 May 2012 17:22:14 -0000 To: common-commits@hadoop.apache.org From: ddas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120503172214.D511623889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ddas Date: Thu May 3 17:22:13 2012 New Revision: 1333559 URL: http://svn.apache.org/viewvc?rev=1333559&view=rev Log: Merge -r 1333556:1333557 from hadoop-trunk onto branch-2. Fixes HADOOP-8346. Modified: hadoop/common/branches/branch-2/ (props changed) hadoop/common/branches/branch-2/hadoop-project/ (props changed) hadoop/common/branches/branch-2/hadoop-project/src/site/ (props changed) Propchange: hadoop/common/branches/branch-2/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1333557 Propchange: hadoop/common/branches/branch-2/hadoop-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-project:r1333557 Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-project/src/site:r1333557