Author: wang
Date: Wed Jan 29 22:40:18 2014
New Revision: 1562618
URL: http://svn.apache.org/r1562618
Log:
HADOOP-10288. Explicit reference to Log4JLogger breaks non-log4j users. Merged
from r1561880 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:r1561880
Propchange:
hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1561880
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin:r1561880
Propchange: hadoop/common/branches/branch-2.3/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf:r1561880
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:r1561880
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:r1561880
