Return-Path: 
 <hdfs-commits-return-8600-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 124A2114BE
	for <apmail-hadoop-hdfs-commits-archive@minotaur.apache.org>;
 Mon,  5 May 2014 11:57:37 +0000 (UTC)
Received: (qmail 8996 invoked by uid 500); 5 May 2014 11:57:26 -0000
Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org
Received: (qmail 8931 invoked by uid 500); 5 May 2014 11:57:26 -0000
Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdfs-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:hdfs-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:hdfs-commits@hadoop.apache.org>
List-Id: <hdfs-commits.hadoop.apache.org>
Reply-To: hdfs-dev@hadoop.apache.org
Delivered-To: mailing list hdfs-commits@hadoop.apache.org
Received: (qmail 8686 invoked by uid 99); 5 May 2014 11:57:17 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 May 2014 11:57:17 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 May 2014 11:57:17 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id F1A4C23889E2;
	Mon,  5 May 2014 11:56:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1592491 - in
 /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs:
 CHANGES.txt src/test/resources/testAclCLI.xml
Date: Mon, 05 May 2014 11:56:53 -0000
To: hdfs-commits@hadoop.apache.org
From: umamahesh@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140505115653.F1A4C23889E2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>