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/10/24 23:23:55 UTC

git commit: Fix CHANGES.txt for HADOOP-112321 and HADOOP-10748.

Repository: hadoop
Updated Branches:
  refs/heads/trunk dc6e819ed -> 0ac698864


Fix CHANGES.txt for HADOOP-112321 and HADOOP-10748.


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

Branch: refs/heads/trunk
Commit: 0ac698864dbaba31806fbf16cb06b55bea792353
Parents: dc6e819
Author: Haohui Mai <wh...@apache.org>
Authored: Fri Oct 24 14:23:43 2014 -0700
Committer: Haohui Mai <wh...@apache.org>
Committed: Fri Oct 24 14:23:43 2014 -0700

----------------------------------------------------------------------
 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/0ac69886/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 c9c4246..a22b760 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -135,6 +135,8 @@ Trunk (Unreleased)
     HADOOP-11188. hadoop-azure: automatically expand page blobs when they become
     full. (Eric Hanson via cnauroth)
 
+    HADOOP-11231. Remove dead code in ServletUtil. (Li Lu via wheat9)
+
   BUG FIXES
 
     HADOOP-9451. Fault single-layer config if node group topology is enabled.
@@ -327,8 +329,6 @@ Trunk (Unreleased)
 
     HADOOP-10996. Stop violence in the *_HOME (aw)
 
-    HADOOP-10748. HttpServer2 should not load JspServlet. (wheat9)
-
     HADOOP-11033. shell scripts ignore JAVA_HOME on OS X. (aw)
 
     HADOOP-11052. hadoop_verify_secure_prereq's results aren't checked 
@@ -359,7 +359,7 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11172. Improve error message in Shell#runCommand on OutOfMemoryError.
     (Yongjun Zhang via wang)
 
-    HADOOP-11231. Remove dead code in ServletUtil. (Li Lu via wheat9)
+    HADOOP-10748. HttpServer2 should not load JspServlet. (wheat9)
 
   OPTIMIZATIONS