move HDFS-4657 to branch-2.2.1

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

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

@@ -381,10 +381,6 @@ Release 2.3.0 - UNRELEASED
 
     HDFS-5267. Remove volatile from LightWeightHashSet. (Junping Du via llu)
 
-    HDFS-4657.  Limit the number of blocks logged by the NN after a block
-    report to a configurable value.  (Aaron T. Myers via Colin Patrick
-    McCabe)
-
     HDFS-4278. Log an ERROR when DFS_BLOCK_ACCESS_TOKEN_ENABLE config is
     disabled but security is turned on. (Kousuke Saruta via harsh)
 
@@ -514,6 +510,10 @@ Release 2.2.1 - UNRELEASED
     HDFS-5331. make SnapshotDiff.java to a o.a.h.util.Tool interface implementation. 
     (Vinayakumar B via umamahesh)
 
+    HDFS-4657.  Limit the number of blocks logged by the NN after a block
+    report to a configurable value.  (Aaron T. Myers via Colin Patrick
+    McCabe)
+
   OPTIMIZATIONS
 
   BUG FIXES