Browse Source

HADOOP-10373: move CHANGES.txt entry to branch-2.6

Colin Patrick Mccabe 10 years ago
parent
commit
ac35e3464f
1 changed files with 2 additions and 2 deletions
  1. 2 2
      hadoop-common-project/hadoop-common/CHANGES.txt

+ 2 - 2
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -126,8 +126,6 @@ Trunk (Unreleased)
 
 
     HADOOP-11041. VersionInfo specifies subversion (Tsuyoshi OZAWA via aw)
     HADOOP-11041. VersionInfo specifies subversion (Tsuyoshi OZAWA via aw)
 
 
-    HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel)
-
   BUG FIXES
   BUG FIXES
 
 
     HADOOP-9451. Fault single-layer config if node group topology is enabled.
     HADOOP-9451. Fault single-layer config if node group topology is enabled.
@@ -511,6 +509,8 @@ Release 2.6.0 - UNRELEASED
     HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations
     HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations
     for Unit testing. (Hari via stevel)
     for Unit testing. (Hari via stevel)
 
 
+    HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel)
+
   OPTIMIZATIONS
   OPTIMIZATIONS
 
 
     HADOOP-10838. Byte array native checksumming. (James Thomas via todd)
     HADOOP-10838. Byte array native checksumming. (James Thomas via todd)