Wrong categorization for a variety of commits in the CHANGES.txt files

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618233 13f79535-47bb-0310-9956-ffa450edef68

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

@@ -202,12 +202,6 @@ Trunk (Unreleased)
     HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting 
     underlying store. (asuresh via tucu)
 
-    HADOOP-8944. Shell command fs -count should include human readable option
-      (Jonathan Allen via aw)
-
-    HADOOP-10231. Add some components in Native Libraries document (Akira 
-      AJISAKA via aw)
-
     HADOOP-10770. KMS add delegation token support. (tucu)
 
     HADOOP-10698. KMS, add proxyuser support. (tucu)
@@ -521,6 +515,12 @@ Release 2.6.0 - UNRELEASED
     HADOOP-10281. Create a scheduler, which assigns schedulables a priority
     level. (Chris Li via Arpit Agarwal)
 
+    HADOOP-8944. Shell command fs -count should include human readable option 
+    (Jonathan Allen via aw)
+
+    HADOOP-10231. Add some components in Native Libraries document (Akira 
+    AJISAKA via aw)
+
   OPTIMIZATIONS
 
     HADOOP-10838. Byte array native checksumming. (James Thomas via todd)

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -137,9 +137,6 @@ Trunk (Unreleased)
 
   BUG FIXES
  
-    HDFS-6517. Remove hadoop-metrics2.properties from hdfs project (Akira 
-               AJISAKA via aw)
-
     HADOOP-9635 Fix potential Stack Overflow in DomainSocket.c (V. Karthik Kumar
                 via cmccabe)
 
@@ -414,6 +411,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-6823. dfs.web.authentication.kerberos.principal shows up in logs for 
     insecure HDFS (Allen Wittenauer via raviprak)
 
+    HDFS-6517. Remove hadoop-metrics2.properties from hdfs project (Akira 
+    AJISAKA via aw)
+
     HDFS-6617. Flake TestDFSZKFailoverController.testManualFailoverWithDFSHAAdmin
     due to a long edit log sync op. (Liang Xie via cnauroth)
 

hadoop-mapreduce-project/CHANGES.txt

@@ -86,15 +86,6 @@ Trunk (Unreleased)
     MAPREDUCE-6019. MapReduce changes for exposing YARN/MR endpoints on multiple
     interfaces. (Craig Welch, Milan Potocnik, Arpit Agarwal via xgong)
 
-    MAPREDUCE-883. harchive: Document how to unarchive (Akira AJISAKA and
-      Koji Noguchi via aw)
-
-    MAPREDUCE-4791. Javadoc for KeyValueTextInputFormat should include default 
-      separator and how to change it (Akira AJISAKA via aw)
-
-    MAPREDUCE-5906. Inconsistent configuration in property 
-      "mapreduce.reduce.shuffle.input.buffer.percent" (Akira AJISAKA via aw)
-
   BUG FIXES
 
     MAPREDUCE-5714. Removed forceful JVM exit in shutDownJob.  
@@ -160,28 +151,6 @@ Trunk (Unreleased)
     MAPREDUCE-5867. Fix NPE in KillAMPreemptionPolicy related to 
     ProportionalCapacityPreemptionPolicy (Sunil G via devaraj)
 
-    MAPREDUCE-5944. Remove MRv1 commands from CommandsManual.apt.vm 
-      (Akira AJISAKA via aw)
-
-    MAPREDUCE-5943. Separate mapred commands from CommandManual.apt.vm
-      (Akira AJISAKA via aw)
-
-    MAPREDUCE-5363. Fix doc and spelling for TaskCompletionEvent#getTaskStatus 
-      and getStatus (Akira AJISAKA via aw)
-
-    MAPREDUCE-5595. Typo in MergeManagerImpl.java (Akira AJISAKA via aw)
-
-    MAPREDUCE-5597. Missing alternatives in javadocs for deprecated constructors 
-      in mapreduce.Job (Akira AJISAKA via aw)
-
-    MAPREDUCE-5950. incorrect description in distcp2 document (Akira AJISAKA 
-      via aw)
-
-    MAPREDUCE-5998. CompositeInputFormat javadoc is broken (Akira AJISAKA via
-      aw)
-
-    MAPREDUCE-5999. Fix dead link in InputFormat javadoc (Akira AJISAKA via aw)
-
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -196,6 +165,15 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-5963. ShuffleHandler DB schema should be versioned with
     compatible/incompatible changes (Junping Du via jlowe)
 
+    MAPREDUCE-883. harchive: Document how to unarchive (Akira AJISAKA and
+      Koji Noguchi via aw)
+
+    MAPREDUCE-4791. Javadoc for KeyValueTextInputFormat should include default
+      separator and how to change it (Akira AJISAKA via aw)
+
+    MAPREDUCE-5906. Inconsistent configuration in property
+      "mapreduce.reduce.shuffle.input.buffer.percent" (Akira AJISAKA via aw)
+
   OPTIMIZATIONS
 
   BUG FIXES
@@ -224,6 +202,28 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-5878. some standard JDK APIs are not part of system classes
     defaults (Sangjin Lee via jlowe)
 
+    MAPREDUCE-5944. Remove MRv1 commands from CommandsManual.apt.vm
+      (Akira AJISAKA via aw)
+
+    MAPREDUCE-5943. Separate mapred commands from CommandManual.apt.vm
+      (Akira AJISAKA via aw)
+
+    MAPREDUCE-5363. Fix doc and spelling for TaskCompletionEvent#getTaskStatus
+      and getStatus (Akira AJISAKA via aw)
+
+    MAPREDUCE-5595. Typo in MergeManagerImpl.java (Akira AJISAKA via aw)
+
+    MAPREDUCE-5597. Missing alternatives in javadocs for deprecated constructors
+     in mapreduce.Job (Akira AJISAKA via aw)
+
+    MAPREDUCE-5950. incorrect description in distcp2 document (Akira AJISAKA
+      via aw)
+
+    MAPREDUCE-5998. CompositeInputFormat javadoc is broken (Akira AJISAKA via
+      aw)
+
+    MAPREDUCE-5999. Fix dead link in InputFormat javadoc (Akira AJISAKA via aw)
+
 Release 2.5.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-yarn-project/CHANGES.txt

@@ -8,12 +8,6 @@ Trunk - Unreleased
 
   IMPROVEMENTS
 
-    YARN-2197. Add a link to YARN CHANGES.txt in the left side of doc
-      (Akira AJISAKA via aw)
-
-    YARN-1918. Typo in description and error message for 
-      'yarn.resourcemanager.cluster-id' (Anandha L Ranganathan via aw)
-
   OPTIMIZATIONS
 
   BUG FIXES
@@ -55,6 +49,12 @@ Release 2.6.0 - UNRELEASED
 
   IMPROVEMENTS
 
+    YARN-2197. Add a link to YARN CHANGES.txt in the left side of doc
+      (Akira AJISAKA via aw)
+
+    YARN-1918. Typo in description and error message for
+      'yarn.resourcemanager.cluster-id' (Anandha L Ranganathan via aw)
+
     YARN-2242. Improve exception information on AM launch crashes. (Li Lu 
     via junping_du)