Fix change log inconsistency among branch 0.17, branch 0.18, and trunk in sections Release 0.17.2 and 0.17.1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@679502 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -511,14 +511,8 @@ Release 0.18.0 - Unreleased
     HADOOP-3401. Update FileBench to set the new
     "mapred.work.output.dir" property to work post-3041. (cdouglas via omalley)
 
-    HADOOP-2159 Namenode stuck in safemode. The counter blockSafe should
-    not be decremented for invalid blocks. (hairong)
-
     HADOOP-2669. DFSClient locks pendingCreates appropriately. (dhruba)
  
-    HADOOP-3477. Fix build to not package contrib/*/bin twice in
-    distributions.  (Adam Heath via cutting)
-
     HADOOP-3410. Fix KFS implemenation to return correct file
     modification time.  (Sriram Rao via cutting)
 
@@ -532,9 +526,6 @@ Release 0.18.0 - Unreleased
     HADOOP-3471. Fix spurious errors from TestIndexedSort and add additional
     logging to let failures be reproducible. (cdouglas)
 
-    HADOOP-3475. Fix MapTask to correctly size the accounting allocation of
-    io.sort.mb. (cdouglas)
-
     HADOOP-3443. Avoid copying map output across partitions when renaming a
     single spill. (omalley via cdouglas)
 
@@ -550,9 +541,6 @@ Release 0.18.0 - Unreleased
     HADOOP-2132. Only RUNNING/PREP jobs can be killed. (Jothi Padmanabhan 
     via ddas)
 
-    HADOOP-3472 MapFile.Reader getClosest() function returns incorrect results
-    when before is true (Todd Lipcon via Stack)
-
     HADOOP-3476. Code cleanup in fuse-dfs.
     (Peter Wyckoff via dhruba)
 
@@ -612,10 +600,6 @@ Release 0.18.0 - Unreleased
     HADOOP-3528. Metrics FilesCreated and files_deleted metrics 
     do not match. (Lohit via Mahadev)
 
-    HADOOP-3442. Limit recursion depth on the stack for QuickSort to prevent
-    StackOverflowErrors. To avoid O(n*n) cases, when partitioning depth exceeds
-    a multiple of log(n), change to HeapSort. (cdouglas)
-
     HADOOP-3418. When a directory is deleted, any leases that point to files
     in the subdirectory are removed. ((Tsz Wo (Nicholas), SZE via dhruba)
 
@@ -651,12 +635,6 @@ Release 0.18.0 - Unreleased
     HADOOP-3520.  TestDFSUpgradeFromImage triggers a race condition in the
     Upgrade Manager. Fixed. (dhruba)
 
-    HADOOP-3550. Fix the serialization data structures in MapTask where the
-    value lengths are incorrectly calculated. (cdouglas)
-
-    HADOOP-3526. Fix contrib/data_join framework by cloning values retained
-    in the reduce. (Spyros Blanas via cdouglas)
-
     HADOOP-3586. Provide deprecated, backwards compatibile semantics for the
     combiner to be run once and only once on each record. (cdouglas)
 
@@ -782,6 +760,14 @@ Release 0.18.0 - Unreleased
     HADOOP-3776. Fix NPE at NameNode when datanode reports a block after it is
     deleted at NameNode. (rangadi)
 
+    HADOOP-3537. Disallow adding a datanode to a network topology when its
+    network location is not resolved. (hairong)
+
+    HADOOP-3571. Fix bug in block removal used in lease recovery. (shv)
+
+    HADOOP-3645. MetricsTimeVaryingRate returns wrong value for
+    metric_avg_time. (Lohit Vijayarenu via hairong)
+
 Release 0.17.2 - Unreleased
 
   BUG FIXES
@@ -789,13 +775,13 @@ Release 0.17.2 - Unreleased
     HADOOP-3678. Avoid spurious exceptions logged at DataNode when clients
     read from DFS. (rangadi)
 
+    HADOOP-3760. Fix a bug with HDFS file close() mistakenly introduced
+    by HADOOP-3681. (Lohit Vijayarenu via rangadi)
+
     HADOOP-3707. NameNode keeps a count of number of blocks scheduled
     to be written to a datanode and uses it to avoid allocating more
     blocks than a datanode can hold. (rangadi)
 
-    HADOOP-3760. Fix a bug with HDFS file close() mistakenly introduced
-    by HADOOP-3681. (Lohit Vijayarenu via rangadi)
-
     HADOOP-3681. DFSClient can get into an infinite loop while closing
     a file if there are some errors. (Lohit Vijayarenu via rangadi)
 
@@ -807,6 +793,9 @@ Release 0.17.2 - Unreleased
     continuously, preventing excessive logging at the namenode.
     (lohit vijayarenu via cdouglas)
 
+    HADOOP-3633. Correct exception handling in DataXceiveServer, and throttle
+    the number of xceiver threads in a data-node. (shv)
+
 Release 0.17.1 - 2008-06-23
 
   INCOMPATIBLE CHANGES
@@ -825,19 +814,31 @@ Release 0.17.1 - 2008-06-23
 
   BUG FIXES
 
-    HADOOP-1979. Speed up fsck by adding a buffered stream. (Lohit
-    Vijaya Renu via omalley)
+    HADOOP-2159 Namenode stuck in safemode. The counter blockSafe should
+    not be decremented for invalid blocks. (hairong)
 
-    HADOOP-3537. Disallow adding a datanode to a network topology when its
-    network location is not resolved. (hairong)
+    HADOOP-3472 MapFile.Reader getClosest() function returns incorrect results
+    when before is true (Todd Lipcon via Stack)
 
-    HADOOP-3571. Fix bug in block removal used in lease recovery. (shv)
+    HADOOP-3442. Limit recursion depth on the stack for QuickSort to prevent
+    StackOverflowErrors. To avoid O(n*n) cases, when partitioning depth
+exceeds
+    a multiple of log(n), change to HeapSort. (cdouglas)
 
-    HADOOP-3645. MetricsTimeVaryingRate returns wrong value for
-    metric_avg_time. (Lohit Vijayarenu via hairong)
+    HADOOP-3477. Fix build to not package contrib/*/bin twice in
+    distributions.  (Adam Heath via cutting)
 
-    HADOOP-3633. Correct exception handling in DataXceiveServer, and throttle
-    the number of xceiver threads in a data-node. (shv)
+    HADOOP-3475. Fix MapTask to correctly size the accounting allocation of
+    io.sort.mb. (cdouglas)
+
+    HADOOP-3550. Fix the serialization data structures in MapTask where the
+    value lengths are incorrectly calculated. (cdouglas)
+
+    HADOOP-3526. Fix contrib/data_join framework by cloning values retained
+    in the reduce. (Spyros Blanas via cdouglas)
+
+    HADOOP-1979. Speed up fsck by adding a buffered stream. (Lohit
+    Vijaya Renu via omalley)
 
 Release 0.17.0 - 2008-05-18