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 su...@apache.org on 2011/04/20 20:32:27 UTC
svn commit: r1095478 - in /hadoop/common/branches/yahoo-merge: ./
CHANGES.txt src/docs/ src/java/ src/java/org/apache/hadoop/fs/FileUtil.java
src/test/core/
Author: suresh
Date: Wed Apr 20 18:32:27 2011
New Revision: 1095478
URL: http://svn.apache.org/viewvc?rev=1095478&view=rev
Log:
Merging change r1080396 from trunk to yahoo-merge
Modified:
hadoop/common/branches/yahoo-merge/ (props changed)
hadoop/common/branches/yahoo-merge/CHANGES.txt (contents, props changed)
hadoop/common/branches/yahoo-merge/src/docs/ (props changed)
hadoop/common/branches/yahoo-merge/src/java/ (props changed)
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FileUtil.java
hadoop/common/branches/yahoo-merge/src/test/core/ (props changed)
Propchange: hadoop/common/branches/yahoo-merge/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 20 18:32:27 2011
@@ -1 +1,2 @@
+/hadoop/common/trunk:1080396
/hadoop/core/branches/branch-0.19/core:713112
Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1095478&r1=1095477&r2=1095478&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Wed Apr 20 18:32:27 2011
@@ -1,5 +1,20 @@
Hadoop Change Log
+Trunk (unreleased changes)
+
+ INCOMPATIBLE CHANGES
+
+ NEW FEATURES
+
+ IMPROVEMENTS
+
+ HADOOP-7133. Batch the calls in DataStorage to FileUtil.createHardLink().
+ (Matt Foley via jghoman)
+
+ OPTIMIZATIONS
+
+ BUG FIXES
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/yahoo-merge/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 20 18:32:27 2011
@@ -1,3 +1,4 @@
+/hadoop/common/trunk/CHANGES.txt:1080396
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Propchange: hadoop/common/branches/yahoo-merge/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 20 18:32:27 2011
@@ -1 +1,2 @@
+/hadoop/common/trunk/src/docs:1080396
/hadoop/core/branches/branch-0.19/src/docs:713112
Propchange: hadoop/common/branches/yahoo-merge/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 20 18:32:27 2011
@@ -1,2 +1,3 @@
+/hadoop/common/trunk/src/java:1080396
/hadoop/core/branches/branch-0.19/core/src/java:713112
/hadoop/core/trunk/src/core:776175-785643,785929-786278
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FileUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FileUtil.java?rev=1095478&r1=1095477&r2=1095478&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FileUtil.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/FileUtil.java Wed Apr 20 18:32:27 2011
@@ -583,6 +583,18 @@ public class FileUtil {
}
/**
+ * Class for creating hardlinks.
+ * Supports Unix, Cygwin, WindXP.
+ * @deprecated Use {@link org.apache.hadoop.fs.HardLink}
+ */
+ @Deprecated
+ public static class HardLink extends org.apache.hadoop.fs.HardLink {
+ // This is a stub to assist with coordinated change between
+ // COMMON and HDFS projects. It will be removed after the
+ // corresponding change is committed to HDFS.
+ }
+
+ /**
* Create a soft link between a src and destination
* only on a local disk. HDFS does not support this
* @param target the target for symlink
Propchange: hadoop/common/branches/yahoo-merge/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 20 18:32:27 2011
@@ -1,2 +1,3 @@
+/hadoop/common/trunk/src/test/core:1080396
/hadoop/core/branches/branch-0.19/core/src/test/core:713112
/hadoop/core/trunk/src/test/core:776175-785643,785929-786278