You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2012/05/14 20:31:21 UTC
svn commit: r1338332 - in
/hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project: ./
hadoop-auth/ hadoop-common/ hadoop-common/CHANGES.txt
hadoop-common/src/main/docs/ hadoop-common/src/main/java/
hadoop-common/src/test/core/
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/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-auth/ (props changed)
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/ (props changed)
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (props changed)
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/
------------------------------------------------------------------------------
--- 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-common-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project:r1337424
Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-auth/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth:r1337424
Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:r1337424
Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1337424
Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs:r1337424
Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java:r1337424
Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core:r1337424