Merging change r1080396 from trunk to yahoo-merge

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1095478 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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

src/java/org/apache/hadoop/fs/FileUtil.java

@@ -582,6 +582,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