Moving HDFS-3961 change from release 1.1 to 1.2

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

CHANGES.txt

@@ -237,6 +237,9 @@ Release 1.2.0 - unreleased
     HADOOP-8786. HttpServer continues to start even if AuthenticationFilter 
     fails to init. (Todd Lipcon via umamahesh)
 
+    HDFS-3961. FSEditLog preallocate() preallocated more than 1MB. (Jing Zhoa
+    via suresh)
+
 Release 1.1.0 - unreleased
 
   INCOMPATIBLE CHANGES
@@ -565,9 +568,6 @@ Release 1.1.0 - unreleased
     HDFS-3466. Get HTTP kerberos principal from the web authentication keytab.
     (omalley)
 
-    HDFS-3961. FSEditLog preallocate() preallocated more than 1MB. (Jing Zhoa
-    via suresh)
-
 Release 1.0.4 - Unreleased
 
   NEW FEATURES