hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [43/50] [abbrv] git commit: MAPREDUCE-6122. TestLineRecordReader may fail due to test data files checked out of git with incorrect line endings. Contributed by Chris Nauroth.
Date Fri, 10 Oct 2014 19:01:22 GMT
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)
(cherry picked from commit 85a2b907407c7719a31c64d3747810263b3ec57d)
(cherry picked from commit 3fe4e0d3dfa90e9001d79cb37cc879bab0e0136f)

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/45e6bd54
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/45e6bd54
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/45e6bd54

Branch: refs/heads/champlain
Commit: 45e6bd5417e302be1112448753b36318ca041088
Parents: 97fa1fc
Author: cnauroth <cnauroth@apache.org>
Authored: Thu Oct 9 22:25:17 2014 -0700
Committer: cnauroth <cnauroth@apache.org>
Committed: Thu Oct 9 22:54:29 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/45e6bd54/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 32b8f15..cbc71b2 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -192,6 +192,9 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-6094. TestMRCJCFileInputFormat.testAddInputPath() fails on trunk
     (Akira AJISAKA 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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/45e6bd54/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes
----------------------------------------------------------------------
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 0000000..cbee8c4
--- /dev/null
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/.gitattributes
@@ -0,0 +1 @@
+src/test/resources/*.txt text eol=lf

http://git-wip-us.apache.org/repos/asf/hadoop/blob/45e6bd54/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
----------------------------------------------------------------------
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 f77d896..321d64c 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>


Mime
View raw message