Author: umamahesh
Date: Mon May 5 11:56:53 2014
New Revision: 1592491
URL: http://svn.apache.org/r1592491
Log:
Merge. HDFS-6337. Setfacl testcase is failing due to dash character in username
in TestAclCLI. Contributed by Uma Maheswara Rao G.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1592491&r1=1592490&r2=1592491&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Mon May 5 11:56:53 2014
@@ -180,6 +180,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6289. HA failover can fail if there are pending DN messages for DNs
which no longer exist. (atm)
+ HDFS-6337. Setfacl testcase is failing due to dash character in username
+ in TestAclCLI (umamahesh)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml?rev=1592491&r1=1592490&r2=1592491&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
Mon May 5 11:56:53 2014
@@ -903,7 +903,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^drwxr-xr-x\+( )*-( )*[a-zA-z0-9]*( )*supergroup(
)*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/dir1/dir2</expected-output>
+ <expected-output>^drwxr-xr-x\+( )*-( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/dir1/dir2</expected-output>
</comparator>
</comparators>
</test>
