hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r1067348 - in /hadoop/mapreduce/branches/branch-0.22: CHANGES.txt src/test/mapred/org/apache/hadoop/cli/testMRConf.xml
Date Fri, 04 Feb 2011 23:35:27 GMT
Author: shv
Date: Fri Feb  4 23:35:27 2011
New Revision: 1067348

URL: http://svn.apache.org/viewvc?rev=1067348&view=rev
Log:
MAPREDUCE-2304. Merge r1067347 from trunk to branch 0.22.

Modified:
    hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml

Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1067348&r1=1067347&r2=1067348&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Fri Feb  4 23:35:27 2011
@@ -472,6 +472,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-1974. Fix multiple preemtions of the same task in FairScheduler.
     (Scott Chen via shv)
 
+    MAPREDUCE-2304. Fix TestMRCLI to allow hostname with a hyphen (-).
+    (Priyo Mustafi via shv)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

Modified: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml?rev=1067348&r1=1067347&r2=1067348&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml
(original)
+++ hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml
Fri Feb  4 23:35:27 2011
@@ -219,7 +219,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>mv: Wrong FS: har:/dest/dir0.har/dir0/file0, expected: hdfs://\w+[.a-z]*:[0-9]+</expected-output>
+          <expected-output>mv: Wrong FS: har:/dest/dir0.har/dir0/file0, expected: hdfs://\w+[-.a-z0-9]*:[0-9]+</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>



Mime
View raw message