Return-Path: X-Original-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8996A10645 for ; Wed, 8 May 2013 00:12:26 +0000 (UTC) Received: (qmail 81772 invoked by uid 500); 8 May 2013 00:12:26 -0000 Delivered-To: apmail-hadoop-yarn-commits-archive@hadoop.apache.org Received: (qmail 81749 invoked by uid 500); 8 May 2013 00:12:26 -0000 Mailing-List: contact yarn-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: yarn-commits@hadoop.apache.org Delivered-To: mailing list yarn-commits@hadoop.apache.org Received: (qmail 81740 invoked by uid 99); 8 May 2013 00:12:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 00:12:26 +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; Wed, 08 May 2013 00:12:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F07F02388A6C; Wed, 8 May 2013 00:12:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1480136 - /hadoop/common/branches/branch-2/hadoop-yarn-project/ Date: Wed, 08 May 2013 00:12:02 -0000 To: yarn-commits@hadoop.apache.org From: ddas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130508001202.F07F02388A6C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ddas Date: Wed May 8 00:12:01 2013 New Revision: 1480136 URL: http://svn.apache.org/r1480136 Log: Merge -r 1477848:1477849 from trunk onto branch-2. Fixes HDFS-4778. Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/ (props changed) Propchange: hadoop/common/branches/branch-2/hadoop-yarn-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-yarn-project:r1477849