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