MAPREDUCE-2304. Fix TestMRCLI to allow hostname with a hyphen (-). Contributed by Priyo Mustafi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1067347 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 0dc4d69..b288ff5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -544,6 +544,9 @@
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
diff --git a/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml b/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml
index 5f2c3e5..dfa2433 100644
--- a/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml
+++ b/src/test/mapred/org/apache/hadoop/cli/testMRConf.xml
@@ -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>
