You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by wh...@apache.org on 2014/11/05 00:07:53 UTC

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

Repository: hadoop
Updated Branches:
  refs/heads/trunk 27f106e22 -> 2e1d9a412


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2e1d9a41
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2e1d9a41
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2e1d9a41

Branch: refs/heads/trunk
Commit: 2e1d9a41273d2374b1f3f707bd44bdf2b7ce69a8
Parents: 27f106e
Author: Haohui Mai <wh...@apache.org>
Authored: Tue Nov 4 15:07:04 2014 -0800
Committer: Haohui Mai <wh...@apache.org>
Committed: Tue Nov 4 15:07:46 2014 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2e1d9a41/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index cc8048d..ede1148 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/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