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.
Modified:
hadoop/common/branches/branch-2.3/ (props changed)
hadoop/common/branches/branch-2.3/hadoop-project/ (props changed)
hadoop/common/branches/branch-2.3/hadoop-project/pom.xml (props changed)
hadoop/common/branches/branch-2.3/hadoop-project/src/site/ (props changed)
Propchange: hadoop/common/branches/branch-2.3/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2:r1561967
Propchange: hadoop/common/branches/branch-2.3/hadoop-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-project:r1561967
Propchange: hadoop/common/branches/branch-2.3/hadoop-project/pom.xml
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-project/pom.xml:r1561967
Propchange: hadoop/common/branches/branch-2.3/hadoop-project/src/site/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-project/src/site:r1561967
