From 684170d5efdc11bcd9967168f44a428d1a72af3c Mon Sep 17 00:00:00 2001
From: cnauroth <cnauroth@apache.org>
Date: Thu, 9 Oct 2014 22:25:17 -0700
Subject: [PATCH] MAPREDUCE-6122. TestLineRecordReader may fail due to test
 data files checked out of git with incorrect line endings. Contributed by
 Chris Nauroth.

---
 hadoop-mapreduce-project/CHANGES.txt                           | 3 +++
 .../hadoop-mapreduce-client-core/.gitattributes                | 1 +
 .../hadoop-mapreduce-client-core/pom.xml                       | 1 +
 3 files changed, 5 insertions(+)
 create mode 100644 hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 1adf7cf66c..c9c18df95d 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -414,6 +414,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
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes
new file mode 100644
index 0000000000..cbee8c4b0e
--- /dev/null
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes
@@ -0,0 +1 @@
+src/test/resources/*.txt text eol=lf
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
index 6e9d543f71..2a4a174d31 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
+++ b/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>