hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1338332 - in /hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project: ./ bin/ conf/ hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/ hadoop-mapreduce-examples/ hadoop-yarn/hadoop-yarn-applications/ hadoo...
Date Mon, 14 May 2012 18:31:22 GMT
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-mapreduce-project/   (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/CHANGES.txt   (props
changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/bin/   (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/conf/   (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-examples/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/c++/   (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/   (props
changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/block_forensics/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/build-contrib.xml
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/build.xml
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/data_join/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/index/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/vaidya/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/examples/   (props
changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/java/   (props
changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/test/mapred/  
(props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
  (props changed)
    hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/webapps/job/  
(props changed)

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/
------------------------------------------------------------------------------
--- 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-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/
------------------------------------------------------------------------------
--- 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-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/
------------------------------------------------------------------------------
--- 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-mapreduce-project/hadoop-yarn/hadoop-yarn-site/
------------------------------------------------------------------------------
--- 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-mapreduce-project/hadoop-yarn/hadoop-yarn-site/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/c++/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/c++:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/block_forensics/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/block_forensics:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/build-contrib.xml:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/build.xml
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/build.xml:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/data_join/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/data_join:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/eclipse-plugin:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/index/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/index:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/contrib/vaidya/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/contrib/vaidya:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/examples/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/examples:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/java/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/java:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/test/mapred/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc:r1337424

Propchange: hadoop/common/branches/branch-2.0.0-alpha/hadoop-mapreduce-project/src/webapps/job/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/webapps/job:r1337424



Mime
View raw message