Author: szetszwo
Date: Thu Apr 12 23:23:39 2012
New Revision: 1325570
URL: http://svn.apache.org/viewvc?rev=1325570&view=rev
Log:
Merge r1325052 through r1325569 from trunk.
Modified:
hadoop/common/branches/HDFS-3092/ (props changed)
hadoop/common/branches/HDFS-3092/hadoop-client/ (props changed)
hadoop/common/branches/HDFS-3092/hadoop-dist/ (props changed)
hadoop/common/branches/HDFS-3092/hadoop-minicluster/ (props changed)
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-archives/ (props
changed)
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-distcp/ (props
changed)
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-extras/ (props
changed)
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/ (props
changed)
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-streaming/ (props
changed)
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/ (props
changed)
Propchange: hadoop/common/branches/HDFS-3092/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1325052-1325569
Propchange: hadoop/common/branches/HDFS-3092/hadoop-client/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 23:23:39 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3092/hadoop-dist/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 23:23:39 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3092/hadoop-minicluster/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 23:23:39 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-archives/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 23:23:39 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-distcp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 23:23:39 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-extras/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 23:23:39 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 23:23:39 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-streaming/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 23:23:39 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Apr 12 23:23:39 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
