Merge -r 759397:759398 from main to 0.18

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@759404 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 32103bf..841547b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,7 +16,7 @@
     HADOOP-5412. Simulated DataNode should not write to a block that's being
     written by another thread. (hairong)
 
-    HADOOP-5414. Fix the problem of blocks remaining under-replicated by
+    HADOOP-5465. Fix the problem of blocks remaining under-replicated by
     providing synchronized modification to the counter xmitsInProgress in
     DataNode. (hairong)