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 84DCBC9BC for ; Mon, 14 May 2012 18:31:46 +0000 (UTC) Received: (qmail 79739 invoked by uid 500); 14 May 2012 18:31:46 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 79681 invoked by uid 500); 14 May 2012 18:31:46 -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 79672 invoked by uid 99); 14 May 2012 18:31:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 May 2012 18:31:46 +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, 14 May 2012 18:31:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D71CD23889E1 for ; Mon, 14 May 2012 18:31:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1338332 - in /hadoop/common/branches/branch-2.0.0-alpha: ./ hadoop-client/ hadoop-dist/ hadoop-minicluster/ hadoop-project-dist/ hadoop-project/ hadoop-project/src/site/ hadoop-tools/ hadoop-tools/hadoop-archives/ hadoop-tools/hadoop-distc... Date: Mon, 14 May 2012 18:31:21 -0000 To: common-commits@hadoop.apache.org From: szetszwo@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120514183121.D71CD23889E1@eris.apache.org> Author: szetszwo Date: Mon May 14 18:31:19 2012 New Revision: 1338332 URL: http://svn.apache.org/viewvc?rev=1338332&view=rev Log: svn merge -c 1337424 from branch-2 for adding .classpath, .project, .settings and target to svn:ignore. Modified: hadoop/common/branches/branch-2.0.0-alpha/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-client/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-dist/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-minicluster/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-project/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-project-dist/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-project/src/site/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-archives/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-distcp/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-extras/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-rumen/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-streaming/ (props changed) hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-tools-dist/ (props changed) Propchange: hadoop/common/branches/branch-2.0.0-alpha/ ------------------------------------------------------------------------------ Merged /hadoop/common/branches/branch-2:r1337424 Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-client/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-dist/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-minicluster/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/branches/branch-2/hadoop-project:r1337424 Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-project-dist/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-project/src/site/ ------------------------------------------------------------------------------ Merged /hadoop/common/branches/branch-2/hadoop-project/src/site:r1337424 Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-archives/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-distcp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-extras/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-rumen/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-streaming/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-tools/hadoop-tools-dist/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon May 14 18:31:19 2012 @@ -1 +1,4 @@ +.classpath +.project +.settings target