HDFS-6063. Merging change r1575171 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575172 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
09671ddb46
commit
d7ef2df14f
|
@ -475,6 +475,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
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue