Author: shv
Date: Fri Feb 4 23:31:37 2011
New Revision: 1067347
URL: http://svn.apache.org/viewvc?rev=1067347&view=rev
Log:
MAPREDUCE-2304. Fix TestMRCLI to allow hostname with a hyphen (-). Contributed
by Priyo Mustafi.
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=1067347&r1=1067346&r2=1067347&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Feb 4 23:31:37 2011
@@ -544,6 +544,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/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=1067347&r1=1067346&r2=1067347&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
Fri Feb 4 23:31:37 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>
