You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by wa...@apache.org on 2014/01/29 23:34:42 UTC
svn commit: r1562617 - in
/hadoop/common/branches/branch-2.3/hadoop-mapreduce-project: ./ CHANGES.txt
bin/ conf/
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
hadoop-mapreduce-examples/
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/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/CHANGES.txt (props changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/bin/ (props changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/conf/ (props changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml (props changed)
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-examples/ (props changed)
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1561967
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1561967
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin:r1561967
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf:r1561967
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1561967
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1561967