HADOOP-10292. Restore HttpServer from branch-2.2 in branch-2. Contributed by Haohui Mai.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561967 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 07:50:54 +00:00 · 2014-01-28 07:50:54 +00:00 · c6095c8ed5
commit c6095c8ed5
parent afc40e8a66
2 changed files with 1106 additions and 0 deletions
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@ -371,6 +371,9 @@ Release 2.3.0 - UNRELEASED
    HADOOP-10255. Rename HttpServer to HttpServer2 to retain older 
    HttpServer in branch-2 for compatibility. (Haohui Mai via suresh)

+    HADOOP-10292. Restore HttpServer from branch-2.2 in branch-2.
+    (Haohui Mai via suresh)
+
 Release 2.2.0 - 2013-10-13

  INCOMPATIBLE CHANGES
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java