corrections in CHANGES.txt as result of comparing jira and CHANGES records before release of 1.2.0 rc

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1479467 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -43,7 +43,7 @@ Release 1.3.0 - unreleased
     HDFS-4699. Additional conditions for avoiding unnecessary 
     DataNode.checkDiskError calls. (Chris Nauroth via kihwal)
 
-Release 1.2.0 - unreleased
+Release 1.2.0 - 2013.05.05
 
   INCOMPATIBLE CHANGES
 
@@ -52,6 +52,9 @@ Release 1.2.0 - unreleased
 
   NEW FEATURES
 
+    HADOOP-8817. Backport Network Topology Extension for Virtualization 
+    (from HADOOP-8468) to branch-1
+
     MAPREDUCE-4660. Update task placement policy for network topology
     with node group. (Junping Du via llu)
 
@@ -136,9 +139,6 @@ Release 1.2.0 - unreleased
     HDFS-3596. Improve FSEditLog pre-allocation in branch-1
     (Colin Patrick McCabe via mattf)
 
-    HDFS-3617. Port HDFS-96 to branch-1 (support blocks greater than 2GB).
-    (Patrick Kling and harsh via eli)
-
     HADOOP-8586. Fixup a bunch of SPNEGO misspellings. (eli)
 
     HDFS-1957. Documentation for HFTP. (Ari Rabkin via eli)
@@ -169,6 +169,9 @@ Release 1.2.0 - unreleased
     HADOOP-8832. Port generic service plugin mechanism from HADOOP-5257
     to branch-1. (backported by Brandon Li via suresh) 
 
+    HDFS-3963. Backport namenode/datanode serviceplugin from HADOOP-5257
+    to branch-1. (backported by Brandon Li via suresh)
+
     MAPREDUCE-2770. Improve hadoop.job.history.location doc in
     mapred-default.xml. (Sandy Ryza via tomwhite)
 
@@ -269,9 +272,6 @@ Release 1.2.0 - unreleased
     MAPREDUCE-4904. OTHER_LOCAL_MAPS counter is not correct.
     (Junping Du via llu)
 
-    MAPREDUCE-4798. Updated TestJobHistoryServer test case for startup
-    race conditions.  (Sam Liu via eyang)
-
     HADOOP-8460. Document proper setting of HADOOP_PID_DIR and
     HADOOP_SECURE_DN_PID_DIR (bobby)
 
@@ -966,6 +966,9 @@ Release 1.1.0 - 2012.09.28
     HDFS-3814. Make the replication monitor multipliers configurable in 1.x.
     (Jing Zhao via suresh)
 
+    HDFS-3617. Port HDFS-96 to branch-1 (support blocks greater than 2GB).
+    (Patrick Kling and harsh via eli)
+
     MAPREDUCE-3289. Make use of fadvise in the NM's shuffle handler.
     (Todd Lipcon and Brandon Li via sseth)