Просмотр исходного кода

fix merge error in CHANGES.TXT

Kihwal Lee 10 лет назад
Родитель
Сommit
285dad32eb
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

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

@@ -1,8 +1,5 @@
 Hadoop HDFS Change Log
 Hadoop HDFS Change Log
 
 
-    HDFS-8879. Quota by storage type usage incorrectly initialized upon namenode
-    restart. (xyao)
-
 Release 2.7.2 - UNRELEASED
 Release 2.7.2 - UNRELEASED
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES
@@ -35,6 +32,9 @@ Release 2.7.2 - UNRELEASED
 
 
     HDFS-8891. HDFS concat should keep srcs order. (Yong Zhang via jing9)
     HDFS-8891. HDFS concat should keep srcs order. (Yong Zhang via jing9)
 
 
+    HDFS-8879. Quota by storage type usage incorrectly initialized upon namenode
+    restart. (xyao)
+
 Release 2.7.1 - 2015-07-06
 Release 2.7.1 - 2015-07-06
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES