Author: cnauroth
Date: Fri Mar 7 05:58:44 2014
New Revision: 1575176
URL: http://svn.apache.org/r1575176
Log:
HDFS-6063. Merging change r1575172 from branch-2 to branch-2.4
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1575176&r1=1575175&r2=1575176&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Mar 7 05:58:44 2014
@@ -461,6 +461,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6039. Uploading a File under a Dir with default acls throws
"Duplicated
ACLFeature". (cnauroth)
+ HDFS-6063. TestAclCLI fails intermittently when running test 24:
+ copyFromLocal. (cnauroth)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml?rev=1575176&r1=1575175&r2=1575176&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
Fri Mar 7 05:58:44 2014
@@ -973,8 +973,8 @@
<test-commands>
<command>-fs NAMENODE -mkdir /dir1</command>
<command>-fs NAMENODE -setfacl -m default:user:charlie:rwx
/dir1</command>
- <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes
/dir1/data15bytes</command>
- <command>-fs NAMENODE -getfacl /dir1/data15bytes</command>
+ <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data1k
/dir1/data1k</command>
+ <command>-fs NAMENODE -getfacl /dir1/data1k</command>
</test-commands>
<cleanup-commands>
<command>-fs NAMENODE -rm -R /dir1</command>
@@ -982,7 +982,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^# file: /dir1/data15bytes$</expected-output>
+ <expected-output>^# file: /dir1/data1k$</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
