Author: cnauroth
Date: Wed Feb 26 22:32:27 2014
New Revision: 1572308
URL: http://svn.apache.org/r1572308
Log:
HDFS-4685. Merge HDFS ACLs to branch-2. Merging changes r1569870, r1570466,
r1570655, r1571573, r1571745, r1572142, r1572189 and r1572190 from trunk to
branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/ (props
changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project:r1547224-1569863
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/conf:r1547224-1569863
Propchange:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-4685/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1547224-1569863
