Return-Path: 
 <mapreduce-commits-return-1163-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: (qmail 44850 invoked from network); 22 Dec 2010 23:59:28 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 22 Dec 2010 23:59:28 -0000
Received: (qmail 47845 invoked by uid 500); 22 Dec 2010 23:59:28 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 47777 invoked by uid 500); 22 Dec 2010 23:59:28 -0000
Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mapreduce-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:mapreduce-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:mapreduce-commits@hadoop.apache.org>
List-Id: <mapreduce-commits.hadoop.apache.org>
Reply-To: mapreduce-dev@hadoop.apache.org
Delivered-To: mailing list mapreduce-commits@hadoop.apache.org
Received: (qmail 47768 invoked by uid 99); 22 Dec 2010 23:59:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Dec 2010 23:59:27 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 22 Dec 2010 23:59:27 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B6BC1238890A; Wed, 22 Dec 2010 23:59:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1052106 - in /hadoop/mapreduce/trunk: CHANGES.txt
 src/test/mapred/org/apache/hadoop/cli/testMRConf.xml
Date: Wed, 22 Dec 2010 23:59:06 -0000
To: mapreduce-commits@hadoop.apache.org
From: cos@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101222235906.B6BC1238890A@eris.apache.org>

Author: cos
Date: Wed Dec 22 23:59:06 2010
New Revision: 1052106

URL: http://svn.apache.org/viewvc?rev=1052106&view=rev
Log:
MAPREDUCE-2223. TestMRCLI might fail on Ubuntu with default /etc/hosts. Contributed by Konstantin Boudnik.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1052106&r1=1052105&r2=1052106&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Wed Dec 22 23:59:06 2010
@@ -475,6 +475,9 @@ Release 0.21.1 - Unreleased
     MAPREDUCE-1809. Ant build changes for Streaming system tests in contrib
     projects. (Vinay Kumar Thota via amareshwari)
 
+    MAPREDUCE-2223. TestMRCLI might fail on Ubuntu with default /etc/hosts
+    (cos)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml?rev=1052106&r1=1052105&r2=1052106&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml (original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml Wed Dec 22 23:59:06 2010
@@ -219,7 +219,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>mv: Wrong FS: har:/dest/dir0.har/dir0/file0, expected: hdfs://localhost[.a-z]*:[0-9]+</expected-output>
+          <expected-output>mv: Wrong FS: har:/dest/dir0.har/dir0/file0, expected: hdfs://\w+[.a-z]*:[0-9]+</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>