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 DAD36D3A6 for ; Thu, 9 Aug 2012 18:07:55 +0000 (UTC) Received: (qmail 30486 invoked by uid 500); 9 Aug 2012 18:07:55 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 30426 invoked by uid 500); 9 Aug 2012 18:07:55 -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 30419 invoked by uid 99); 9 Aug 2012 18:07:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 18:07:55 +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, 09 Aug 2012 18:07:53 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6B0EB23889B8 for ; Thu, 9 Aug 2012 18:07:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1371349 - /hadoop/common/branches/branch-trunk-win/ Date: Thu, 09 Aug 2012 18:07:09 -0000 To: common-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120809180709.6B0EB23889B8@eris.apache.org> Author: acmurthy Date: Thu Aug 9 18:07:08 2012 New Revision: 1371349 URL: http://svn.apache.org/viewvc?rev=1371349&view=rev Log: Re-basing branch-trunk-win after YARN-1 Added: hadoop/common/branches/branch-trunk-win/ (props changed) - copied from r1371348, hadoop/common/trunk/ Propchange: hadoop/common/branches/branch-trunk-win/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Aug 9 18:07:08 2012 @@ -0,0 +1,5 @@ +.classpath +.git +.project +.settings +target Propchange: hadoop/common/branches/branch-trunk-win/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Aug 9 18:07:08 2012 @@ -0,0 +1,2 @@ +/hadoop/common/branches/HDFS-1623:1152502-1296519 +/hadoop/common/branches/HDFS-3042:1306184-1342109