瀏覽代碼

Update CHANGES.txt for committing HADOOP-10717 to branch-2.

Haohui Mai 10 年之前
父節點
當前提交
2e1d9a4127
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      hadoop-common-project/hadoop-common/CHANGES.txt

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

@@ -306,9 +306,6 @@ Trunk (Unreleased)
     HADOOP-10625. Trim configuration names when putting/getting them
     to properties. (Wangda Tan via xgong)
 
-    HADOOP-10717. HttpServer2 should load jsp DTD from local jars instead of
-    going remote. (Dapeng Sun via wheat9)
-
     HADOOP-10689. InputStream is not closed in
     AzureNativeFileSystemStore#retrieve(). (Chen He via cnauroth)
 
@@ -389,6 +386,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11165. TestUTF8 fails when run against java 8.
     (Stephen Chu via cnauroth)
 
+    HADOOP-10717. HttpServer2 should load jsp DTD from local jars instead of
+    going remote. (Dapeng Sun via wheat9)
+
 Release 2.6.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES