Selaa lähdekoodia

MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked out of git with incorrect line endings. Contributed by Chris Nauroth.

(cherry picked from commit 684170d5efdc11bcd9967168f44a428d1a72af3c)
cnauroth 10 vuotta sitten
vanhempi
commit
85a2b90740

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -195,6 +195,9 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-6029. TestCommitterEventHandler fails in trunk (Mit Desai via
     jlowe)
 
+    MAPREDUCE-6029. TestLineRecordReader may fail due to test data files checked
+    out of git with incorrect line endings. (cnauroth)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES

+ 1 - 0
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes

@@ -0,0 +1 @@
+src/test/resources/*.txt text eol=lf

+ 1 - 0
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml

@@ -90,6 +90,7 @@
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
+            <exclude>.gitattributes</exclude>
             <exclude>src/test/resources/recordSpanningMultipleSplits.txt</exclude>
             <exclude>src/test/resources/testBOM.txt</exclude>
           </excludes>