Explorar o código

Move HADOOP-11543 section in CHANGES.txt to remove the conflict between trunk and branch-2.

Akira Ajisaka %!s(int64=10) %!d(string=hai) anos
pai
achega
f607b72448
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      hadoop-common-project/hadoop-common/CHANGES.txt

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

@@ -583,9 +583,6 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11463 Replace method-local TransferManager object with
     S3AFileSystem#transfers. (Ted Yu via stevel)
 
-    HADOOP-11543. Improve help message for hadoop/yarn command.
-    (Brahma Reddy Battula via ozawa)
-
     HADOOP-11520. Clean incomplete multi-part uploads in S3A tests.
     (Thomas Demoor via stevel)
 
@@ -594,6 +591,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-10140. Specification of HADOOP_CONF_DIR via the environment in
     hadoop_config.cmd. (Kiran Kumar M R via cnauroth)
 
+    HADOOP-11543. Improve help message for hadoop/yarn command. (Brahma 
+    Reddy Battula via ozawa).
+
   OPTIMIZATIONS
 
     HADOOP-11323. WritableComparator#compare keeps reference to byte array.