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 683D2DFD1 for ; Tue, 28 May 2013 20:25:57 +0000 (UTC) Received: (qmail 39449 invoked by uid 500); 28 May 2013 20:25:57 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 39269 invoked by uid 500); 28 May 2013 20:25:56 -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 39261 invoked by uid 99); 28 May 2013 20:25:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 May 2013 20:25:56 +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; Tue, 28 May 2013 20:25:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 52BB9238889B for ; Tue, 28 May 2013 20:25:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1487099 - in /hadoop/common/branches/branch-2: ./ hadoop-project/ hadoop-project/src/site/ Date: Tue, 28 May 2013 20:25:36 -0000 To: common-commits@hadoop.apache.org From: ddas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130528202536.52BB9238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ddas Date: Tue May 28 20:25:35 2013 New Revision: 1487099 URL: http://svn.apache.org/r1487099 Log: Merge -r 1487092:1487093 from trunk onto branch-2. Fixes HDFS-4827. 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:r1487093 Propchange: hadoop/common/branches/branch-2/hadoop-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-project:r1487093 Propchange: hadoop/common/branches/branch-2/hadoop-project/src/site/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-project/src/site:r1487093