Author: wang
Date: Wed Jan 29 22:34:40 2014
New Revision: 1562617
URL: http://svn.apache.org/r1562617
Log:
HADOOP-10292. Restore HttpServer from branch-2.2 in branch-2. Merged from
r1561967 in branch-2.
Added:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
- copied unchanged from r1561967,
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
Propchange: hadoop/common/branches/branch-2.3/hadoop-common-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project:r1561967
Propchange: hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-auth/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth:r1561967
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:r1561967
Modified:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1562617&r1=1562616&r2=1562617&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Jan 29 22:34:40 2014
@@ -363,6 +363,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
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1561967
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src:r1561967
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs:r1561967
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java:r1561967
Propchange:
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core:r1561967
